Regenerate WeylScal4 (Kranc commit 20e7a8feb560e494efe6b00db07af8b350fc9783)HEAD master

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/WeylScal4/trunk@138 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843
author: hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843> 2013-10-12 10:01:48 +0000
committer: hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843> 2013-10-12 10:01:48 +0000
commit: ee248b1256dc94bf10e72c19efa500272fcf2336 (patch)
tree: 89efdc31747381017238fbcad54d2157a9fbdfc5
parent: 0d93bcf67c8fb82991463c283922f89cddd3394a (diff)
14 files changed, 1096 insertions, 1232 deletions
diff --git a/interface.ccl b/interface.ccl
index ff86ca3..4629a91 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -2,16 +2,15 @@
 
 implements: WeylScal4
 
-inherits:   admbase methodoflines Grid GenericFD Boundary
+inherits:   admbase Boundary GenericFD Grid methodoflines
 
 
 
 USES INCLUDE: GenericFD.h
-USES INCLUDE: Symmetry.h
-USES INCLUDE: sbp_calc_coeffs.h
-USES INCLUDE: Boundary.h
 USES INCLUDE: loopcontrol.h
+USES INCLUDE: Symmetry.h
 USES INCLUDE: vectors.h
+USES INCLUDE: Boundary.h
 
 CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex)
 USES FUNCTION MoLRegisterEvolved
@@ -29,109 +28,109 @@ CCTK_INT FUNCTION Boundary_SelectVarForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT
 USES FUNCTION Boundary_SelectVarForBC
 
 public:
-CCTK_REAL curvIi_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi0r_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=1'
 {
-  curvIi
-} "curvIi_group"
+  Psi0r
+} "Psi0r_group"
 
 public:
-CCTK_REAL curvIr_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi0i_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=-1'
 {
-  curvIr
-} "curvIr_group"
+  Psi0i
+} "Psi0i_group"
 
 public:
-CCTK_REAL curvJ1_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi1r_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="++-"'
 {
-  curvJ1
-} "curvJ1_group"
+  Psi1r
+} "Psi1r_group"
 
 public:
-CCTK_REAL curvJ2_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi1i_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="--+"'
 {
-  curvJ2
-} "curvJ2_group"
+  Psi1i
+} "Psi1i_group"
 
 public:
-CCTK_REAL curvJ3_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi2r_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=1'
 {
-  curvJ3
-} "curvJ3_group"
+  Psi2r
+} "Psi2r_group"
 
 public:
-CCTK_REAL curvJ4_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi2i_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=-1'
 {
-  curvJ4
-} "curvJ4_group"
+  Psi2i
+} "Psi2i_group"
 
 public:
-CCTK_REAL curvJi_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi3r_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="++-"'
 {
-  curvJi
-} "curvJi_group"
+  Psi3r
+} "Psi3r_group"
 
 public:
-CCTK_REAL curvJr_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
+CCTK_REAL Psi3i_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="--+"'
 {
-  curvJr
-} "curvJr_group"
+  Psi3i
+} "Psi3i_group"
 
 public:
-CCTK_REAL Psi0i_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=-1'
+CCTK_REAL Psi4r_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=1'
 {
-  Psi0i
-} "Psi0i_group"
+  Psi4r
+} "Psi4r_group"
 
 public:
-CCTK_REAL Psi0r_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=1'
+CCTK_REAL Psi4i_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=-1'
 {
-  Psi0r
-} "Psi0r_group"
+  Psi4i
+} "Psi4i_group"
 
 public:
-CCTK_REAL Psi1i_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="--+"'
+CCTK_REAL curvIr_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi1i
-} "Psi1i_group"
+  curvIr
+} "curvIr_group"
 
 public:
-CCTK_REAL Psi1r_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="++-"'
+CCTK_REAL curvIi_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi1r
-} "Psi1r_group"
+  curvIi
+} "curvIi_group"
 
 public:
-CCTK_REAL Psi2i_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=-1'
+CCTK_REAL curvJr_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi2i
-} "Psi2i_group"
+  curvJr
+} "curvJr_group"
 
 public:
-CCTK_REAL Psi2r_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=1'
+CCTK_REAL curvJi_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi2r
-} "Psi2r_group"
+  curvJi
+} "curvJi_group"
 
 public:
-CCTK_REAL Psi3i_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="--+"'
+CCTK_REAL curvJ1_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi3i
-} "Psi3i_group"
+  curvJ1
+} "curvJ1_group"
 
 public:
-CCTK_REAL Psi3r_group type=GF timelevels=3 tags='tensortypealias="ManualCartesian" tensorweight=0 cartesianreflectionparities="++-"'
+CCTK_REAL curvJ2_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi3r
-} "Psi3r_group"
+  curvJ2
+} "curvJ2_group"
 
 public:
-CCTK_REAL Psi4i_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=-1'
+CCTK_REAL curvJ3_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi4i
-} "Psi4i_group"
+  curvJ3
+} "curvJ3_group"
 
 public:
-CCTK_REAL Psi4r_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0 tensorparity=1'
+CCTK_REAL curvJ4_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0'
 {
-  Psi4r
-} "Psi4r_group"
+  curvJ4
+} "curvJ4_group"
diff --git a/param.ccl b/param.ccl
index 34452d6..b70931c 100644
--- a/param.ccl
+++ b/param.ccl
@@ -24,6 +24,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_REAL offset "offset"
 {
   "*:*" :: ""
@@ -100,12 +106,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:3 :: ""
-} 1
-
-restricted:
 CCTK_INT WeylScal4_psi4_calc_Nth_calc_every "WeylScal4_psi4_calc_Nth_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/schedule.ccl b/schedule.ccl
index 1027a85..f75bb9d 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,41 +1,41 @@
 # File produced by Kranc
 
 
-STORAGE: curvIi_group[timelevels]
+STORAGE: Psi0r_group[timelevels]
 
-STORAGE: curvIr_group[timelevels]
+STORAGE: Psi0i_group[timelevels]
 
-STORAGE: curvJ1_group[timelevels]
+STORAGE: Psi1r_group[timelevels]
 
-STORAGE: curvJ2_group[timelevels]
+STORAGE: Psi1i_group[timelevels]
 
-STORAGE: curvJ3_group[timelevels]
+STORAGE: Psi2r_group[timelevels]
 
-STORAGE: curvJ4_group[timelevels]
+STORAGE: Psi2i_group[timelevels]
 
-STORAGE: curvJi_group[timelevels]
+STORAGE: Psi3r_group[timelevels]
 
-STORAGE: curvJr_group[timelevels]
+STORAGE: Psi3i_group[timelevels]
 
-STORAGE: Psi0i_group[timelevels]
+STORAGE: Psi4r_group[timelevels]
 
-STORAGE: Psi0r_group[timelevels]
+STORAGE: Psi4i_group[timelevels]
 
-STORAGE: Psi1i_group[timelevels]
+STORAGE: curvIr_group[timelevels]
 
-STORAGE: Psi1r_group[timelevels]
+STORAGE: curvIi_group[timelevels]
 
-STORAGE: Psi2i_group[timelevels]
+STORAGE: curvJr_group[timelevels]
 
-STORAGE: Psi2r_group[timelevels]
+STORAGE: curvJi_group[timelevels]
 
-STORAGE: Psi3i_group[timelevels]
+STORAGE: curvJ1_group[timelevels]
 
-STORAGE: Psi3r_group[timelevels]
+STORAGE: curvJ2_group[timelevels]
 
-STORAGE: Psi4i_group[timelevels]
+STORAGE: curvJ3_group[timelevels]
 
-STORAGE: Psi4r_group[timelevels]
+STORAGE: curvJ4_group[timelevels]
 
 schedule WeylScal4_Startup at STARTUP
 {
diff --git a/src/RegisterSymmetries.cc b/src/RegisterSymmetries.cc
index 25a5e1b..584b295 100644
--- a/src/RegisterSymmetries.cc
+++ b/src/RegisterSymmetries.cc
@@ -19,91 +19,91 @@ extern "C" void WeylScal4_RegisterSymmetries(CCTK_ARGUMENTS)
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvIi");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi0r");
+  
+  sym[0] = -1;
+  sym[1] = -1;
+  sym[2] = -1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi0i");
   
   sym[0] = 1;
   sym[1] = 1;
+  sym[2] = -1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi1r");
+  
+  sym[0] = -1;
+  sym[1] = -1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvIr");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi1i");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ1");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi2r");
+  
+  sym[0] = -1;
+  sym[1] = -1;
+  sym[2] = -1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi2i");
   
   sym[0] = 1;
   sym[1] = 1;
+  sym[2] = -1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi3r");
+  
+  sym[0] = -1;
+  sym[1] = -1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ2");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi3i");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ3");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi4r");
+  
+  sym[0] = -1;
+  sym[1] = -1;
+  sym[2] = -1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi4i");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ4");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvIr");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJi");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvIi");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
   SetCartSymVN(cctkGH, sym, "WeylScal4::curvJr");
   
-  sym[0] = -1;
-  sym[1] = -1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi0i");
-  
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi0r");
-  
-  sym[0] = -1;
-  sym[1] = -1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi1i");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJi");
   
   sym[0] = 1;
   sym[1] = 1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi1r");
-  
-  sym[0] = -1;
-  sym[1] = -1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi2i");
+  sym[2] = 1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ1");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi2r");
-  
-  sym[0] = -1;
-  sym[1] = -1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi3i");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ2");
   
   sym[0] = 1;
   sym[1] = 1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi3r");
-  
-  sym[0] = -1;
-  sym[1] = -1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi4i");
+  sym[2] = 1;
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ3");
   
   sym[0] = 1;
   sym[1] = 1;
   sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "WeylScal4::Psi4r");
+  SetCartSymVN(cctkGH, sym, "WeylScal4::curvJ4");
   
 }
diff --git a/src/WeylScal4_invars_calc_2nd.cc b/src/WeylScal4_invars_calc_2nd.cc
index 8a446e4..f403565 100644
--- a/src/WeylScal4_invars_calc_2nd.cc
+++ b/src/WeylScal4_invars_calc_2nd.cc
@@ -51,13 +51,18 @@ static void WeylScal4_invars_calc_2nd_Body(const cGH* restrict const cctkGH, con
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -102,9 +107,9 @@ static void WeylScal4_invars_calc_2nd_Body(const cGH* restrict const cctkGH, con
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -121,26 +126,6 @@ static void WeylScal4_invars_calc_2nd_Body(const cGH* restrict const cctkGH, con
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -233,28 +218,28 @@ static void WeylScal4_invars_calc_2nd_Body(const cGH* restrict const cctkGH, con
     }
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvIrL = 
+    CCTK_REAL_VEC curvIrL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),kmadd(kmul(Psi2iL,Psi2iL),ToReal(-3),knmsub(Psi0iL,Psi4iL,kmadd(kmul(Psi2rL,Psi2rL),ToReal(3),kmul(Psi1iL,kmul(Psi3iL,ToReal(4))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvIiL = 
+    CCTK_REAL_VEC curvIiL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmadd(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(-4),kmul(Psi2iL,kmul(Psi2rL,ToReal(6))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJrL = 
+    CCTK_REAL_VEC curvJrL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(Psi2rL,kmul(Psi2rL,Psi2rL),kmadd(Psi4rL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0rL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(2),knmsub(Psi2iL,kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmadd(Psi1rL,kmul(Psi3iL,ToReal(2)),kmul(Psi1iL,kmul(Psi3rL,ToReal(2)))))),kmadd(Psi2rL,kmadd(Psi0rL,Psi4rL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(-2)),kmsub(Psi1rL,kmul(Psi3rL,ToReal(2)),kmul(Psi0iL,Psi4iL)))),kmul(Psi2rL,kmul(kmul(Psi2iL,Psi2iL),ToReal(3)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJiL = 
+    CCTK_REAL_VEC curvJiL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi2iL,kmul(Psi2iL,Psi2iL),kmadd(Psi4rL,kmadd(Psi0iL,Psi2rL,kmul(Psi1iL,kmul(Psi1rL,ToReal(-2)))),kmadd(Psi0rL,kmadd(Psi2rL,Psi4iL,kmul(Psi3iL,kmul(Psi3rL,ToReal(-2)))),kmadd(Psi4iL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0iL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(Psi2rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(2)),kmul(Psi2iL,kmadd(Psi0rL,Psi4rL,kmadd(kmul(Psi2rL,Psi2rL),ToReal(-3),kmadd(Psi1iL,kmul(Psi3iL,ToReal(-2)),kmsub(Psi1rL,kmul(Psi3rL,ToReal(2)),kmul(Psi0iL,Psi4iL))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ1L = 
+    CCTK_REAL_VEC curvJ1L CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(-16),kmadd(Psi0iL,Psi4iL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(-4)),kmadd(kmul(Psi2rL,Psi2rL),ToReal(-3),knmsub(Psi0rL,Psi4rL,kmadd(kmul(Psi2iL,Psi2iL),ToReal(3),kmul(Psi1rL,kmul(Psi3rL,ToReal(4)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ2L = 
+    CCTK_REAL_VEC curvJ2L CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(Psi2rL,kmul(Psi2rL,Psi2rL),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(-2),kmadd(Psi4rL,kmsub(Psi1rL,Psi1rL,kmul(Psi1iL,Psi1iL)),kmadd(Psi0rL,kmsub(Psi3rL,Psi3rL,kmul(Psi3iL,Psi3iL)),kmadd(Psi2rL,kmadd(Psi0iL,Psi4iL,kmadd(kmul(Psi2iL,Psi2iL),ToReal(-3),kmadd(Psi1rL,kmul(Psi3rL,ToReal(-2)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(2)),kmul(Psi0rL,Psi4rL))))),kmul(Psi2iL,kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(2)))))))))),ToReal(96));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ3L = 
+    CCTK_REAL_VEC curvJ3L CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(kmul(Psi0iL,Psi0iL),kmul(Psi4iL,Psi4iL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi4rL,Psi4rL),kmadd(kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi3iL,Psi3iL),kmul(kmul(Psi1iL,Psi1iL),kmul(Psi3rL,Psi3rL))),ToReal(-16),kmadd(Psi0iL,kmul(Psi0rL,kmul(Psi4iL,kmul(Psi4rL,ToReal(-4)))),knmsub(kmul(Psi0rL,Psi0rL),kmul(Psi4iL,Psi4iL),knmsub(kmul(Psi0iL,Psi0iL),kmul(Psi4rL,Psi4rL),kmadd(kmul(Psi2rL,Psi2rL),kmul(kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(4)),kmul(Psi0iL,Psi4iL)))),ToReal(6)),kmadd(kmadd(Psi0rL,kmul(Psi1rL,kmul(Psi3iL,Psi4iL)),kmadd(Psi0rL,kmul(Psi1iL,kmul(Psi3rL,Psi4iL)),kmadd(Psi0iL,kmul(Psi1rL,kmul(Psi3rL,Psi4iL)),kmul(Psi0iL,kmul(Psi1rL,kmul(Psi3iL,Psi4rL)))))),ToReal(8),kmadd(Psi3rL,kmadd(Psi0rL,kmul(Psi1rL,kmul(Psi4rL,ToReal(-8))),kmul(Psi0iL,kmul(Psi1iL,kmul(Psi4rL,ToReal(8))))),kmadd(Psi1iL,kmadd(Psi1rL,kmul(Psi3iL,kmul(Psi3rL,ToReal(-64))),kmadd(Psi0iL,kmul(Psi3iL,kmul(Psi4iL,ToReal(-8))),kmul(Psi0rL,kmul(Psi3iL,kmul(Psi4rL,ToReal(8)))))),kmadd(kmadd(kmul(Psi2iL,Psi2iL),kmul(Psi2iL,Psi2iL),kmul(kmul(Psi2rL,Psi2rL),kmul(Psi2rL,Psi2rL))),ToReal(9),kmadd(kmul(Psi2iL,Psi2iL),kmul(ToReal(-6),kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),knmsub(Psi0iL,Psi4iL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(4)),kmul(kmul(Psi2rL,Psi2rL),ToReal(9))))))),kmadd(Psi2iL,kmul(Psi2rL,kmul(knmsub(Psi0rL,Psi4iL,knmsub(Psi0iL,Psi4rL,kmadd(Psi1rL,kmul(Psi3iL,ToReal(4)),kmul(Psi1iL,kmul(Psi3rL,ToReal(4)))))),ToReal(12))),kmul(kmadd(kmul(Psi1iL,Psi1iL),kmul(Psi3iL,Psi3iL),kmul(kmul(Psi1rL,Psi1rL),kmul(Psi3rL,Psi3rL))),ToReal(16))))))))))))))),ToReal(64));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ4L = 
+    CCTK_REAL_VEC curvJ4L CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(-640),kmadd(Psi1iL,kmul(kmadd(kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmul(Psi1rL,Psi1rL),kmul(Psi0rL,kmul(Psi3iL,kmul(Psi3rL,Psi3rL)))),ToReal(-12)),kmadd(kmadd(Psi3iL,kmul(Psi4iL,kmul(Psi1rL,kmul(Psi1rL,Psi1rL))),kmul(Psi0iL,kmul(Psi1iL,kmul(Psi3rL,kmul(Psi3rL,Psi3rL))))),ToReal(-4),kmadd(kmul(Psi2rL,kmul(kmul(Psi2rL,Psi2rL),kmul(Psi2rL,Psi2rL))),ToReal(-3),kmadd(Psi4rL,kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi3iL,Psi3iL),kmsub(kmul(Psi0iL,Psi0iL),kmul(Psi3rL,Psi3rL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi3rL,Psi3rL),kmul(kmul(Psi0iL,Psi0iL),kmul(Psi3iL,Psi3iL))))),kmadd(Psi0rL,kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi4iL,Psi4iL),kmsub(kmul(Psi1iL,Psi1iL),kmul(Psi4rL,Psi4rL),kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi4rL,Psi4rL),kmul(kmul(Psi1iL,Psi1iL),kmul(Psi4iL,Psi4iL))))),kmadd(kmadd(kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmul(Psi1iL,kmul(Psi1iL,Psi1iL)),kmadd(Psi3rL,kmul(Psi4rL,kmul(Psi1rL,kmul(Psi1rL,Psi1rL))),kmadd(Psi0rL,kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),Psi4rL,kmul(Psi1iL,kmul(Psi3iL,kmul(Psi3iL,Psi3iL)))),kmul(Psi1rL,kmadd(Psi0iL,kmul(Psi3iL,kmul(Psi3iL,Psi3iL)),kmul(Psi0rL,kmul(Psi3rL,kmul(Psi3rL,Psi3rL)))))))),ToReal(4),kmadd(ToReal(-2),kmadd(Psi4iL,kmadd(Psi3iL,kmul(Psi3rL,kmul(Psi0iL,Psi0iL)),kmul(Psi0iL,kmadd(Psi4rL,kmul(Psi1iL,Psi1iL),kmul(Psi0rL,kmul(Psi3iL,Psi3iL))))),kmul(kmul(Psi2rL,kmul(Psi2rL,Psi2rL)),kmadd(Psi0iL,Psi4iL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-5)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(5)),kmul(Psi0rL,Psi4rL)))))),kmadd(ToReal(2),kmadd(Psi4iL,kmadd(Psi3iL,kmul(Psi3rL,kmul(Psi0rL,Psi0rL)),kmul(Psi0iL,kmadd(Psi4rL,kmul(Psi1rL,Psi1rL),kmul(Psi0rL,kmul(Psi3rL,Psi3rL))))),kmadd(kmul(Psi2iL,kmul(Psi2iL,Psi2iL)),kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(5)))),kmul(Psi2iL,kmadd(Psi3rL,kmadd(Psi1iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-15)),kmul(Psi3iL,kmul(kmul(Psi1iL,Psi1iL),ToReal(-8)))),kmadd(Psi4iL,kmadd(Psi2rL,kmul(kmul(Psi1iL,Psi1iL),ToReal(-3)),kmul(Psi4rL,kmsub(Psi0iL,Psi0iL,kmul(Psi0rL,Psi0rL)))),knmsub(Psi0iL,kmadd(Psi1iL,kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmadd(Psi2rL,kmul(kmul(Psi3rL,Psi3rL),ToReal(-3)),kmadd(Psi0rL,kmsub(Psi4rL,Psi4rL,kmul(Psi4iL,Psi4iL)),kmul(kmadd(Psi4rL,kmul(Psi2rL,Psi2rL),kmul(Psi2rL,kmul(Psi3iL,Psi3iL))),ToReal(3))))),kmadd(Psi0rL,kmadd(Psi1iL,kmul(Psi3rL,Psi4rL),kmadd(Psi4iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-3)),kmul(Psi3iL,kmsub(Psi2rL,kmul(Psi3rL,ToReal(6)),kmul(Psi1iL,Psi4iL))))),kmadd(kmul(Psi1rL,Psi1rL),kmadd(Psi2rL,kmul(Psi4iL,ToReal(3)),kmul(Psi3iL,kmul(Psi3rL,ToReal(8)))),kmul(Psi1rL,kmadd(Psi3iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-15)),kmadd(Psi4iL,kmsub(Psi0rL,Psi3rL,kmul(Psi0iL,Psi3iL)),kmadd(Psi4rL,kmadd(Psi0rL,Psi3iL,kmadd(Psi0iL,Psi3rL,kmul(Psi1iL,kmul(Psi2rL,ToReal(6))))),kmul(Psi1iL,kmadd(kmul(Psi3iL,Psi3iL),ToReal(-8),kmul(kmul(Psi3rL,Psi3rL),ToReal(8)))))))))))))))),kmadd(ToReal(3),kmadd(kmul(Psi2rL,Psi2rL),kmadd(Psi4rL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0rL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmul(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(2)))),kmul(kmul(Psi2iL,Psi2iL),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(-2),kmadd(Psi4rL,kmsub(Psi1rL,Psi1rL,kmul(Psi1iL,Psi1iL)),kmadd(Psi0rL,kmsub(Psi3rL,Psi3rL,kmul(Psi3iL,Psi3iL)),kmadd(Psi2rL,kmul(ToReal(2),kmadd(Psi0iL,Psi4iL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-5)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(5)),kmul(Psi0rL,Psi4rL))))),kmul(kmul(Psi2rL,kmul(Psi2rL,Psi2rL)),ToReal(10)))))))),kmadd(Psi1rL,kmadd(Psi0rL,kmul(Psi3rL,kmul(kmul(Psi3iL,Psi3iL),ToReal(-12))),kmadd(Psi0iL,kmul(Psi1iL,kmul(kmul(Psi4iL,Psi4iL),ToReal(-2))),kmul(kmul(Psi1iL,Psi1iL),kmadd(Psi3rL,kmul(Psi4rL,ToReal(-12)),kmul(Psi3iL,kmul(Psi4iL,ToReal(12))))))),kmadd(Psi0iL,kmadd(Psi1rL,kmul(Psi3iL,kmul(kmul(Psi3rL,Psi3rL),ToReal(-12))),kmul(Psi1iL,kmadd(Psi1rL,kmul(kmul(Psi4rL,Psi4rL),ToReal(2)),kmul(Psi3rL,kmul(kmul(Psi3iL,Psi3iL),ToReal(12)))))),kmul(Psi2rL,kmadd(kmul(Psi0iL,Psi0iL),kmul(Psi4iL,Psi4iL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi4rL,Psi4rL),kmadd(kmul(kmul(Psi2iL,Psi2iL),kmul(Psi2iL,Psi2iL)),ToReal(-15),kmadd(Psi0iL,kmul(Psi0rL,kmul(Psi4iL,kmul(Psi4rL,ToReal(-4)))),knmsub(kmul(Psi0rL,Psi0rL),kmul(Psi4iL,Psi4iL),knmsub(kmul(Psi0iL,Psi0iL),kmul(Psi4rL,Psi4rL),kmadd(kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(kmul(Psi1iL,Psi1iL),ToReal(-8),kmul(kmul(Psi1rL,Psi1rL),ToReal(8))),kmul(ToReal(2),kmadd(Psi1rL,kmadd(Psi0iL,kmul(Psi3rL,Psi4iL),kmadd(Psi0iL,kmul(Psi3iL,Psi4rL),kmul(Psi0rL,kmsub(Psi3iL,Psi4iL,kmul(Psi3rL,Psi4rL))))),kmul(Psi1iL,kmadd(Psi0rL,kmul(Psi3rL,Psi4iL),kmadd(Psi0rL,kmul(Psi3iL,Psi4rL),kmadd(Psi0iL,kmul(Psi3rL,Psi4rL),kmul(Psi3iL,kmsub(Psi1rL,kmul(Psi3rL,ToReal(16)),kmul(Psi0iL,Psi4iL)))))))))))))))))))))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_invars_calc_4th.cc b/src/WeylScal4_invars_calc_4th.cc
index d263add..6ce1f15 100644
--- a/src/WeylScal4_invars_calc_4th.cc
+++ b/src/WeylScal4_invars_calc_4th.cc
@@ -51,13 +51,18 @@ static void WeylScal4_invars_calc_4th_Body(const cGH* restrict const cctkGH, con
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -102,9 +107,9 @@ static void WeylScal4_invars_calc_4th_Body(const cGH* restrict const cctkGH, con
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -121,26 +126,6 @@ static void WeylScal4_invars_calc_4th_Body(const cGH* restrict const cctkGH, con
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -233,28 +218,28 @@ static void WeylScal4_invars_calc_4th_Body(const cGH* restrict const cctkGH, con
     }
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvIrL = 
+    CCTK_REAL_VEC curvIrL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),kmadd(kmul(Psi2iL,Psi2iL),ToReal(-3),knmsub(Psi0iL,Psi4iL,kmadd(kmul(Psi2rL,Psi2rL),ToReal(3),kmul(Psi1iL,kmul(Psi3iL,ToReal(4))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvIiL = 
+    CCTK_REAL_VEC curvIiL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmadd(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(-4),kmul(Psi2iL,kmul(Psi2rL,ToReal(6))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJrL = 
+    CCTK_REAL_VEC curvJrL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(Psi2rL,kmul(Psi2rL,Psi2rL),kmadd(Psi4rL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0rL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(2),knmsub(Psi2iL,kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmadd(Psi1rL,kmul(Psi3iL,ToReal(2)),kmul(Psi1iL,kmul(Psi3rL,ToReal(2)))))),kmadd(Psi2rL,kmadd(Psi0rL,Psi4rL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(-2)),kmsub(Psi1rL,kmul(Psi3rL,ToReal(2)),kmul(Psi0iL,Psi4iL)))),kmul(Psi2rL,kmul(kmul(Psi2iL,Psi2iL),ToReal(3)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJiL = 
+    CCTK_REAL_VEC curvJiL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi2iL,kmul(Psi2iL,Psi2iL),kmadd(Psi4rL,kmadd(Psi0iL,Psi2rL,kmul(Psi1iL,kmul(Psi1rL,ToReal(-2)))),kmadd(Psi0rL,kmadd(Psi2rL,Psi4iL,kmul(Psi3iL,kmul(Psi3rL,ToReal(-2)))),kmadd(Psi4iL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0iL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(Psi2rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(2)),kmul(Psi2iL,kmadd(Psi0rL,Psi4rL,kmadd(kmul(Psi2rL,Psi2rL),ToReal(-3),kmadd(Psi1iL,kmul(Psi3iL,ToReal(-2)),kmsub(Psi1rL,kmul(Psi3rL,ToReal(2)),kmul(Psi0iL,Psi4iL))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ1L = 
+    CCTK_REAL_VEC curvJ1L CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(-16),kmadd(Psi0iL,Psi4iL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(-4)),kmadd(kmul(Psi2rL,Psi2rL),ToReal(-3),knmsub(Psi0rL,Psi4rL,kmadd(kmul(Psi2iL,Psi2iL),ToReal(3),kmul(Psi1rL,kmul(Psi3rL,ToReal(4)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ2L = 
+    CCTK_REAL_VEC curvJ2L CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(Psi2rL,kmul(Psi2rL,Psi2rL),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(-2),kmadd(Psi4rL,kmsub(Psi1rL,Psi1rL,kmul(Psi1iL,Psi1iL)),kmadd(Psi0rL,kmsub(Psi3rL,Psi3rL,kmul(Psi3iL,Psi3iL)),kmadd(Psi2rL,kmadd(Psi0iL,Psi4iL,kmadd(kmul(Psi2iL,Psi2iL),ToReal(-3),kmadd(Psi1rL,kmul(Psi3rL,ToReal(-2)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(2)),kmul(Psi0rL,Psi4rL))))),kmul(Psi2iL,kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(2)))))))))),ToReal(96));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ3L = 
+    CCTK_REAL_VEC curvJ3L CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(kmul(Psi0iL,Psi0iL),kmul(Psi4iL,Psi4iL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi4rL,Psi4rL),kmadd(kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi3iL,Psi3iL),kmul(kmul(Psi1iL,Psi1iL),kmul(Psi3rL,Psi3rL))),ToReal(-16),kmadd(Psi0iL,kmul(Psi0rL,kmul(Psi4iL,kmul(Psi4rL,ToReal(-4)))),knmsub(kmul(Psi0rL,Psi0rL),kmul(Psi4iL,Psi4iL),knmsub(kmul(Psi0iL,Psi0iL),kmul(Psi4rL,Psi4rL),kmadd(kmul(Psi2rL,Psi2rL),kmul(kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(4)),kmul(Psi0iL,Psi4iL)))),ToReal(6)),kmadd(kmadd(Psi0rL,kmul(Psi1rL,kmul(Psi3iL,Psi4iL)),kmadd(Psi0rL,kmul(Psi1iL,kmul(Psi3rL,Psi4iL)),kmadd(Psi0iL,kmul(Psi1rL,kmul(Psi3rL,Psi4iL)),kmul(Psi0iL,kmul(Psi1rL,kmul(Psi3iL,Psi4rL)))))),ToReal(8),kmadd(Psi3rL,kmadd(Psi0rL,kmul(Psi1rL,kmul(Psi4rL,ToReal(-8))),kmul(Psi0iL,kmul(Psi1iL,kmul(Psi4rL,ToReal(8))))),kmadd(Psi1iL,kmadd(Psi1rL,kmul(Psi3iL,kmul(Psi3rL,ToReal(-64))),kmadd(Psi0iL,kmul(Psi3iL,kmul(Psi4iL,ToReal(-8))),kmul(Psi0rL,kmul(Psi3iL,kmul(Psi4rL,ToReal(8)))))),kmadd(kmadd(kmul(Psi2iL,Psi2iL),kmul(Psi2iL,Psi2iL),kmul(kmul(Psi2rL,Psi2rL),kmul(Psi2rL,Psi2rL))),ToReal(9),kmadd(kmul(Psi2iL,Psi2iL),kmul(ToReal(-6),kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),knmsub(Psi0iL,Psi4iL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(4)),kmul(kmul(Psi2rL,Psi2rL),ToReal(9))))))),kmadd(Psi2iL,kmul(Psi2rL,kmul(knmsub(Psi0rL,Psi4iL,knmsub(Psi0iL,Psi4rL,kmadd(Psi1rL,kmul(Psi3iL,ToReal(4)),kmul(Psi1iL,kmul(Psi3rL,ToReal(4)))))),ToReal(12))),kmul(kmadd(kmul(Psi1iL,Psi1iL),kmul(Psi3iL,Psi3iL),kmul(kmul(Psi1rL,Psi1rL),kmul(Psi3rL,Psi3rL))),ToReal(16))))))))))))))),ToReal(64));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ4L = 
+    CCTK_REAL_VEC curvJ4L CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(-640),kmadd(Psi1iL,kmul(kmadd(kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmul(Psi1rL,Psi1rL),kmul(Psi0rL,kmul(Psi3iL,kmul(Psi3rL,Psi3rL)))),ToReal(-12)),kmadd(kmadd(Psi3iL,kmul(Psi4iL,kmul(Psi1rL,kmul(Psi1rL,Psi1rL))),kmul(Psi0iL,kmul(Psi1iL,kmul(Psi3rL,kmul(Psi3rL,Psi3rL))))),ToReal(-4),kmadd(kmul(Psi2rL,kmul(kmul(Psi2rL,Psi2rL),kmul(Psi2rL,Psi2rL))),ToReal(-3),kmadd(Psi4rL,kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi3iL,Psi3iL),kmsub(kmul(Psi0iL,Psi0iL),kmul(Psi3rL,Psi3rL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi3rL,Psi3rL),kmul(kmul(Psi0iL,Psi0iL),kmul(Psi3iL,Psi3iL))))),kmadd(Psi0rL,kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi4iL,Psi4iL),kmsub(kmul(Psi1iL,Psi1iL),kmul(Psi4rL,Psi4rL),kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi4rL,Psi4rL),kmul(kmul(Psi1iL,Psi1iL),kmul(Psi4iL,Psi4iL))))),kmadd(kmadd(kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmul(Psi1iL,kmul(Psi1iL,Psi1iL)),kmadd(Psi3rL,kmul(Psi4rL,kmul(Psi1rL,kmul(Psi1rL,Psi1rL))),kmadd(Psi0rL,kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),Psi4rL,kmul(Psi1iL,kmul(Psi3iL,kmul(Psi3iL,Psi3iL)))),kmul(Psi1rL,kmadd(Psi0iL,kmul(Psi3iL,kmul(Psi3iL,Psi3iL)),kmul(Psi0rL,kmul(Psi3rL,kmul(Psi3rL,Psi3rL)))))))),ToReal(4),kmadd(ToReal(-2),kmadd(Psi4iL,kmadd(Psi3iL,kmul(Psi3rL,kmul(Psi0iL,Psi0iL)),kmul(Psi0iL,kmadd(Psi4rL,kmul(Psi1iL,Psi1iL),kmul(Psi0rL,kmul(Psi3iL,Psi3iL))))),kmul(kmul(Psi2rL,kmul(Psi2rL,Psi2rL)),kmadd(Psi0iL,Psi4iL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-5)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(5)),kmul(Psi0rL,Psi4rL)))))),kmadd(ToReal(2),kmadd(Psi4iL,kmadd(Psi3iL,kmul(Psi3rL,kmul(Psi0rL,Psi0rL)),kmul(Psi0iL,kmadd(Psi4rL,kmul(Psi1rL,Psi1rL),kmul(Psi0rL,kmul(Psi3rL,Psi3rL))))),kmadd(kmul(Psi2iL,kmul(Psi2iL,Psi2iL)),kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(5)))),kmul(Psi2iL,kmadd(Psi3rL,kmadd(Psi1iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-15)),kmul(Psi3iL,kmul(kmul(Psi1iL,Psi1iL),ToReal(-8)))),kmadd(Psi4iL,kmadd(Psi2rL,kmul(kmul(Psi1iL,Psi1iL),ToReal(-3)),kmul(Psi4rL,kmsub(Psi0iL,Psi0iL,kmul(Psi0rL,Psi0rL)))),knmsub(Psi0iL,kmadd(Psi1iL,kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmadd(Psi2rL,kmul(kmul(Psi3rL,Psi3rL),ToReal(-3)),kmadd(Psi0rL,kmsub(Psi4rL,Psi4rL,kmul(Psi4iL,Psi4iL)),kmul(kmadd(Psi4rL,kmul(Psi2rL,Psi2rL),kmul(Psi2rL,kmul(Psi3iL,Psi3iL))),ToReal(3))))),kmadd(Psi0rL,kmadd(Psi1iL,kmul(Psi3rL,Psi4rL),kmadd(Psi4iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-3)),kmul(Psi3iL,kmsub(Psi2rL,kmul(Psi3rL,ToReal(6)),kmul(Psi1iL,Psi4iL))))),kmadd(kmul(Psi1rL,Psi1rL),kmadd(Psi2rL,kmul(Psi4iL,ToReal(3)),kmul(Psi3iL,kmul(Psi3rL,ToReal(8)))),kmul(Psi1rL,kmadd(Psi3iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-15)),kmadd(Psi4iL,kmsub(Psi0rL,Psi3rL,kmul(Psi0iL,Psi3iL)),kmadd(Psi4rL,kmadd(Psi0rL,Psi3iL,kmadd(Psi0iL,Psi3rL,kmul(Psi1iL,kmul(Psi2rL,ToReal(6))))),kmul(Psi1iL,kmadd(kmul(Psi3iL,Psi3iL),ToReal(-8),kmul(kmul(Psi3rL,Psi3rL),ToReal(8)))))))))))))))),kmadd(ToReal(3),kmadd(kmul(Psi2rL,Psi2rL),kmadd(Psi4rL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0rL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmul(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(2)))),kmul(kmul(Psi2iL,Psi2iL),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(-2),kmadd(Psi4rL,kmsub(Psi1rL,Psi1rL,kmul(Psi1iL,Psi1iL)),kmadd(Psi0rL,kmsub(Psi3rL,Psi3rL,kmul(Psi3iL,Psi3iL)),kmadd(Psi2rL,kmul(ToReal(2),kmadd(Psi0iL,Psi4iL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-5)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(5)),kmul(Psi0rL,Psi4rL))))),kmul(kmul(Psi2rL,kmul(Psi2rL,Psi2rL)),ToReal(10)))))))),kmadd(Psi1rL,kmadd(Psi0rL,kmul(Psi3rL,kmul(kmul(Psi3iL,Psi3iL),ToReal(-12))),kmadd(Psi0iL,kmul(Psi1iL,kmul(kmul(Psi4iL,Psi4iL),ToReal(-2))),kmul(kmul(Psi1iL,Psi1iL),kmadd(Psi3rL,kmul(Psi4rL,ToReal(-12)),kmul(Psi3iL,kmul(Psi4iL,ToReal(12))))))),kmadd(Psi0iL,kmadd(Psi1rL,kmul(Psi3iL,kmul(kmul(Psi3rL,Psi3rL),ToReal(-12))),kmul(Psi1iL,kmadd(Psi1rL,kmul(kmul(Psi4rL,Psi4rL),ToReal(2)),kmul(Psi3rL,kmul(kmul(Psi3iL,Psi3iL),ToReal(12)))))),kmul(Psi2rL,kmadd(kmul(Psi0iL,Psi0iL),kmul(Psi4iL,Psi4iL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi4rL,Psi4rL),kmadd(kmul(kmul(Psi2iL,Psi2iL),kmul(Psi2iL,Psi2iL)),ToReal(-15),kmadd(Psi0iL,kmul(Psi0rL,kmul(Psi4iL,kmul(Psi4rL,ToReal(-4)))),knmsub(kmul(Psi0rL,Psi0rL),kmul(Psi4iL,Psi4iL),knmsub(kmul(Psi0iL,Psi0iL),kmul(Psi4rL,Psi4rL),kmadd(kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(kmul(Psi1iL,Psi1iL),ToReal(-8),kmul(kmul(Psi1rL,Psi1rL),ToReal(8))),kmul(ToReal(2),kmadd(Psi1rL,kmadd(Psi0iL,kmul(Psi3rL,Psi4iL),kmadd(Psi0iL,kmul(Psi3iL,Psi4rL),kmul(Psi0rL,kmsub(Psi3iL,Psi4iL,kmul(Psi3rL,Psi4rL))))),kmul(Psi1iL,kmadd(Psi0rL,kmul(Psi3rL,Psi4iL),kmadd(Psi0rL,kmul(Psi3iL,Psi4rL),kmadd(Psi0iL,kmul(Psi3rL,Psi4rL),kmul(Psi3iL,kmsub(Psi1rL,kmul(Psi3rL,ToReal(16)),kmul(Psi0iL,Psi4iL)))))))))))))))))))))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_invars_calc_Nth.cc b/src/WeylScal4_invars_calc_Nth.cc
index 9d03106..aecbf9a 100644
--- a/src/WeylScal4_invars_calc_Nth.cc
+++ b/src/WeylScal4_invars_calc_Nth.cc
@@ -51,13 +51,18 @@ static void WeylScal4_invars_calc_Nth_Body(const cGH* restrict const cctkGH, con
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -102,9 +107,9 @@ static void WeylScal4_invars_calc_Nth_Body(const cGH* restrict const cctkGH, con
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -121,26 +126,6 @@ static void WeylScal4_invars_calc_Nth_Body(const cGH* restrict const cctkGH, con
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -233,28 +218,28 @@ static void WeylScal4_invars_calc_Nth_Body(const cGH* restrict const cctkGH, con
     }
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvIrL = 
+    CCTK_REAL_VEC curvIrL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),kmadd(kmul(Psi2iL,Psi2iL),ToReal(-3),knmsub(Psi0iL,Psi4iL,kmadd(kmul(Psi2rL,Psi2rL),ToReal(3),kmul(Psi1iL,kmul(Psi3iL,ToReal(4))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvIiL = 
+    CCTK_REAL_VEC curvIiL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmadd(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(-4),kmul(Psi2iL,kmul(Psi2rL,ToReal(6))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJrL = 
+    CCTK_REAL_VEC curvJrL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(Psi2rL,kmul(Psi2rL,Psi2rL),kmadd(Psi4rL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0rL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(2),knmsub(Psi2iL,kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmadd(Psi1rL,kmul(Psi3iL,ToReal(2)),kmul(Psi1iL,kmul(Psi3rL,ToReal(2)))))),kmadd(Psi2rL,kmadd(Psi0rL,Psi4rL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(-2)),kmsub(Psi1rL,kmul(Psi3rL,ToReal(2)),kmul(Psi0iL,Psi4iL)))),kmul(Psi2rL,kmul(kmul(Psi2iL,Psi2iL),ToReal(3)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJiL = 
+    CCTK_REAL_VEC curvJiL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(Psi2iL,kmul(Psi2iL,Psi2iL),kmadd(Psi4rL,kmadd(Psi0iL,Psi2rL,kmul(Psi1iL,kmul(Psi1rL,ToReal(-2)))),kmadd(Psi0rL,kmadd(Psi2rL,Psi4iL,kmul(Psi3iL,kmul(Psi3rL,ToReal(-2)))),kmadd(Psi4iL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0iL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(Psi2rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(2)),kmul(Psi2iL,kmadd(Psi0rL,Psi4rL,kmadd(kmul(Psi2rL,Psi2rL),ToReal(-3),kmadd(Psi1iL,kmul(Psi3iL,ToReal(-2)),kmsub(Psi1rL,kmul(Psi3rL,ToReal(2)),kmul(Psi0iL,Psi4iL))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ1L = 
+    CCTK_REAL_VEC curvJ1L CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(-16),kmadd(Psi0iL,Psi4iL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(-4)),kmadd(kmul(Psi2rL,Psi2rL),ToReal(-3),knmsub(Psi0rL,Psi4rL,kmadd(kmul(Psi2iL,Psi2iL),ToReal(3),kmul(Psi1rL,kmul(Psi3rL,ToReal(4)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ2L = 
+    CCTK_REAL_VEC curvJ2L CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(Psi2rL,kmul(Psi2rL,Psi2rL),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(-2),kmadd(Psi4rL,kmsub(Psi1rL,Psi1rL,kmul(Psi1iL,Psi1iL)),kmadd(Psi0rL,kmsub(Psi3rL,Psi3rL,kmul(Psi3iL,Psi3iL)),kmadd(Psi2rL,kmadd(Psi0iL,Psi4iL,kmadd(kmul(Psi2iL,Psi2iL),ToReal(-3),kmadd(Psi1rL,kmul(Psi3rL,ToReal(-2)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(2)),kmul(Psi0rL,Psi4rL))))),kmul(Psi2iL,kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(2)))))))))),ToReal(96));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ3L = 
+    CCTK_REAL_VEC curvJ3L CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(kmul(Psi0iL,Psi0iL),kmul(Psi4iL,Psi4iL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi4rL,Psi4rL),kmadd(kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi3iL,Psi3iL),kmul(kmul(Psi1iL,Psi1iL),kmul(Psi3rL,Psi3rL))),ToReal(-16),kmadd(Psi0iL,kmul(Psi0rL,kmul(Psi4iL,kmul(Psi4rL,ToReal(-4)))),knmsub(kmul(Psi0rL,Psi0rL),kmul(Psi4iL,Psi4iL),knmsub(kmul(Psi0iL,Psi0iL),kmul(Psi4rL,Psi4rL),kmadd(kmul(Psi2rL,Psi2rL),kmul(kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(4)),kmul(Psi0iL,Psi4iL)))),ToReal(6)),kmadd(kmadd(Psi0rL,kmul(Psi1rL,kmul(Psi3iL,Psi4iL)),kmadd(Psi0rL,kmul(Psi1iL,kmul(Psi3rL,Psi4iL)),kmadd(Psi0iL,kmul(Psi1rL,kmul(Psi3rL,Psi4iL)),kmul(Psi0iL,kmul(Psi1rL,kmul(Psi3iL,Psi4rL)))))),ToReal(8),kmadd(Psi3rL,kmadd(Psi0rL,kmul(Psi1rL,kmul(Psi4rL,ToReal(-8))),kmul(Psi0iL,kmul(Psi1iL,kmul(Psi4rL,ToReal(8))))),kmadd(Psi1iL,kmadd(Psi1rL,kmul(Psi3iL,kmul(Psi3rL,ToReal(-64))),kmadd(Psi0iL,kmul(Psi3iL,kmul(Psi4iL,ToReal(-8))),kmul(Psi0rL,kmul(Psi3iL,kmul(Psi4rL,ToReal(8)))))),kmadd(kmadd(kmul(Psi2iL,Psi2iL),kmul(Psi2iL,Psi2iL),kmul(kmul(Psi2rL,Psi2rL),kmul(Psi2rL,Psi2rL))),ToReal(9),kmadd(kmul(Psi2iL,Psi2iL),kmul(ToReal(-6),kmadd(Psi0rL,Psi4rL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-4)),knmsub(Psi0iL,Psi4iL,kmadd(Psi1iL,kmul(Psi3iL,ToReal(4)),kmul(kmul(Psi2rL,Psi2rL),ToReal(9))))))),kmadd(Psi2iL,kmul(Psi2rL,kmul(knmsub(Psi0rL,Psi4iL,knmsub(Psi0iL,Psi4rL,kmadd(Psi1rL,kmul(Psi3iL,ToReal(4)),kmul(Psi1iL,kmul(Psi3rL,ToReal(4)))))),ToReal(12))),kmul(kmadd(kmul(Psi1iL,Psi1iL),kmul(Psi3iL,Psi3iL),kmul(kmul(Psi1rL,Psi1rL),kmul(Psi3rL,Psi3rL))),ToReal(16))))))))))))))),ToReal(64));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED curvJ4L = 
+    CCTK_REAL_VEC curvJ4L CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(-640),kmadd(Psi1iL,kmul(kmadd(kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmul(Psi1rL,Psi1rL),kmul(Psi0rL,kmul(Psi3iL,kmul(Psi3rL,Psi3rL)))),ToReal(-12)),kmadd(kmadd(Psi3iL,kmul(Psi4iL,kmul(Psi1rL,kmul(Psi1rL,Psi1rL))),kmul(Psi0iL,kmul(Psi1iL,kmul(Psi3rL,kmul(Psi3rL,Psi3rL))))),ToReal(-4),kmadd(kmul(Psi2rL,kmul(kmul(Psi2rL,Psi2rL),kmul(Psi2rL,Psi2rL))),ToReal(-3),kmadd(Psi4rL,kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi3iL,Psi3iL),kmsub(kmul(Psi0iL,Psi0iL),kmul(Psi3rL,Psi3rL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi3rL,Psi3rL),kmul(kmul(Psi0iL,Psi0iL),kmul(Psi3iL,Psi3iL))))),kmadd(Psi0rL,kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi4iL,Psi4iL),kmsub(kmul(Psi1iL,Psi1iL),kmul(Psi4rL,Psi4rL),kmadd(kmul(Psi1rL,Psi1rL),kmul(Psi4rL,Psi4rL),kmul(kmul(Psi1iL,Psi1iL),kmul(Psi4iL,Psi4iL))))),kmadd(kmadd(kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmul(Psi1iL,kmul(Psi1iL,Psi1iL)),kmadd(Psi3rL,kmul(Psi4rL,kmul(Psi1rL,kmul(Psi1rL,Psi1rL))),kmadd(Psi0rL,kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),Psi4rL,kmul(Psi1iL,kmul(Psi3iL,kmul(Psi3iL,Psi3iL)))),kmul(Psi1rL,kmadd(Psi0iL,kmul(Psi3iL,kmul(Psi3iL,Psi3iL)),kmul(Psi0rL,kmul(Psi3rL,kmul(Psi3rL,Psi3rL)))))))),ToReal(4),kmadd(ToReal(-2),kmadd(Psi4iL,kmadd(Psi3iL,kmul(Psi3rL,kmul(Psi0iL,Psi0iL)),kmul(Psi0iL,kmadd(Psi4rL,kmul(Psi1iL,Psi1iL),kmul(Psi0rL,kmul(Psi3iL,Psi3iL))))),kmul(kmul(Psi2rL,kmul(Psi2rL,Psi2rL)),kmadd(Psi0iL,Psi4iL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-5)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(5)),kmul(Psi0rL,Psi4rL)))))),kmadd(ToReal(2),kmadd(Psi4iL,kmadd(Psi3iL,kmul(Psi3rL,kmul(Psi0rL,Psi0rL)),kmul(Psi0iL,kmadd(Psi4rL,kmul(Psi1rL,Psi1rL),kmul(Psi0rL,kmul(Psi3rL,Psi3rL))))),kmadd(kmul(Psi2iL,kmul(Psi2iL,Psi2iL)),kmadd(Psi0rL,Psi4iL,kmadd(Psi0iL,Psi4rL,kmul(kmadd(Psi1rL,Psi3iL,kmul(Psi1iL,Psi3rL)),ToReal(5)))),kmul(Psi2iL,kmadd(Psi3rL,kmadd(Psi1iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-15)),kmul(Psi3iL,kmul(kmul(Psi1iL,Psi1iL),ToReal(-8)))),kmadd(Psi4iL,kmadd(Psi2rL,kmul(kmul(Psi1iL,Psi1iL),ToReal(-3)),kmul(Psi4rL,kmsub(Psi0iL,Psi0iL,kmul(Psi0rL,Psi0rL)))),knmsub(Psi0iL,kmadd(Psi1iL,kmadd(Psi3rL,Psi4iL,kmul(Psi3iL,Psi4rL)),kmadd(Psi2rL,kmul(kmul(Psi3rL,Psi3rL),ToReal(-3)),kmadd(Psi0rL,kmsub(Psi4rL,Psi4rL,kmul(Psi4iL,Psi4iL)),kmul(kmadd(Psi4rL,kmul(Psi2rL,Psi2rL),kmul(Psi2rL,kmul(Psi3iL,Psi3iL))),ToReal(3))))),kmadd(Psi0rL,kmadd(Psi1iL,kmul(Psi3rL,Psi4rL),kmadd(Psi4iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-3)),kmul(Psi3iL,kmsub(Psi2rL,kmul(Psi3rL,ToReal(6)),kmul(Psi1iL,Psi4iL))))),kmadd(kmul(Psi1rL,Psi1rL),kmadd(Psi2rL,kmul(Psi4iL,ToReal(3)),kmul(Psi3iL,kmul(Psi3rL,ToReal(8)))),kmul(Psi1rL,kmadd(Psi3iL,kmul(kmul(Psi2rL,Psi2rL),ToReal(-15)),kmadd(Psi4iL,kmsub(Psi0rL,Psi3rL,kmul(Psi0iL,Psi3iL)),kmadd(Psi4rL,kmadd(Psi0rL,Psi3iL,kmadd(Psi0iL,Psi3rL,kmul(Psi1iL,kmul(Psi2rL,ToReal(6))))),kmul(Psi1iL,kmadd(kmul(Psi3iL,Psi3iL),ToReal(-8),kmul(kmul(Psi3rL,Psi3rL),ToReal(8)))))))))))))))),kmadd(ToReal(3),kmadd(kmul(Psi2rL,Psi2rL),kmadd(Psi4rL,kmsub(Psi1iL,Psi1iL,kmul(Psi1rL,Psi1rL)),kmadd(Psi0rL,kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmul(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(2)))),kmul(kmul(Psi2iL,Psi2iL),kmadd(kmadd(Psi0iL,kmul(Psi3iL,Psi3rL),kmul(Psi1iL,kmul(Psi1rL,Psi4iL))),ToReal(-2),kmadd(Psi4rL,kmsub(Psi1rL,Psi1rL,kmul(Psi1iL,Psi1iL)),kmadd(Psi0rL,kmsub(Psi3rL,Psi3rL,kmul(Psi3iL,Psi3iL)),kmadd(Psi2rL,kmul(ToReal(2),kmadd(Psi0iL,Psi4iL,kmadd(Psi1rL,kmul(Psi3rL,ToReal(-5)),kmsub(Psi1iL,kmul(Psi3iL,ToReal(5)),kmul(Psi0rL,Psi4rL))))),kmul(kmul(Psi2rL,kmul(Psi2rL,Psi2rL)),ToReal(10)))))))),kmadd(Psi1rL,kmadd(Psi0rL,kmul(Psi3rL,kmul(kmul(Psi3iL,Psi3iL),ToReal(-12))),kmadd(Psi0iL,kmul(Psi1iL,kmul(kmul(Psi4iL,Psi4iL),ToReal(-2))),kmul(kmul(Psi1iL,Psi1iL),kmadd(Psi3rL,kmul(Psi4rL,ToReal(-12)),kmul(Psi3iL,kmul(Psi4iL,ToReal(12))))))),kmadd(Psi0iL,kmadd(Psi1rL,kmul(Psi3iL,kmul(kmul(Psi3rL,Psi3rL),ToReal(-12))),kmul(Psi1iL,kmadd(Psi1rL,kmul(kmul(Psi4rL,Psi4rL),ToReal(2)),kmul(Psi3rL,kmul(kmul(Psi3iL,Psi3iL),ToReal(12)))))),kmul(Psi2rL,kmadd(kmul(Psi0iL,Psi0iL),kmul(Psi4iL,Psi4iL),kmadd(kmul(Psi0rL,Psi0rL),kmul(Psi4rL,Psi4rL),kmadd(kmul(kmul(Psi2iL,Psi2iL),kmul(Psi2iL,Psi2iL)),ToReal(-15),kmadd(Psi0iL,kmul(Psi0rL,kmul(Psi4iL,kmul(Psi4rL,ToReal(-4)))),knmsub(kmul(Psi0rL,Psi0rL),kmul(Psi4iL,Psi4iL),knmsub(kmul(Psi0iL,Psi0iL),kmul(Psi4rL,Psi4rL),kmadd(kmsub(Psi3iL,Psi3iL,kmul(Psi3rL,Psi3rL)),kmadd(kmul(Psi1iL,Psi1iL),ToReal(-8),kmul(kmul(Psi1rL,Psi1rL),ToReal(8))),kmul(ToReal(2),kmadd(Psi1rL,kmadd(Psi0iL,kmul(Psi3rL,Psi4iL),kmadd(Psi0iL,kmul(Psi3iL,Psi4rL),kmul(Psi0rL,kmsub(Psi3iL,Psi4iL,kmul(Psi3rL,Psi4rL))))),kmul(Psi1iL,kmadd(Psi0rL,kmul(Psi3rL,Psi4iL),kmadd(Psi0rL,kmul(Psi3iL,Psi4rL),kmadd(Psi0iL,kmul(Psi3rL,Psi4rL),kmul(Psi3iL,kmsub(Psi1rL,kmul(Psi3rL,ToReal(16)),kmul(Psi0iL,Psi4iL)))))))))))))))))))))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_psi4_calc_2nd.cc b/src/WeylScal4_psi4_calc_2nd.cc
index eed89f8..a8692d8 100644
--- a/src/WeylScal4_psi4_calc_2nd.cc
+++ b/src/WeylScal4_psi4_calc_2nd.cc
@@ -68,13 +68,18 @@ static void WeylScal4_psi4_calc_2nd_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -119,9 +124,9 @@ static void WeylScal4_psi4_calc_2nd_Body(const cGH* restrict const cctkGH, const
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -138,26 +143,6 @@ static void WeylScal4_psi4_calc_2nd_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -995,350 +980,350 @@ static void WeylScal4_psi4_calc_2nd_Body(const cGH* restrict const cctkGH, const
       JacPDstandard2nd32gyz = PDstandard2nd23gyz;
     }
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED detg = 
+    CCTK_REAL_VEC detg CCTK_ATTRIBUTE_UNUSED = 
       knmsub(gyyL,kmul(gxzL,gxzL),knmsub(gxxL,kmul(gyzL,gyzL),kmadd(gzzL,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)),kmul(gxyL,kmul(gxzL,kmul(gyzL,ToReal(2)))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED invdetg = kdiv(ToReal(1),detg);
+    CCTK_REAL_VEC invdetg CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(1),detg);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv11 = 
+    CCTK_REAL_VEC gInv11 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gyyL,gzzL,kmul(gyzL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv12 = 
+    CCTK_REAL_VEC gInv12 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv13 = 
+    CCTK_REAL_VEC gInv13 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv21 = 
+    CCTK_REAL_VEC gInv21 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv22 = 
+    CCTK_REAL_VEC gInv22 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gzzL,kmul(gxzL,gxzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv23 = 
+    CCTK_REAL_VEC gInv23 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv31 = 
+    CCTK_REAL_VEC gInv31 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv32 = 
+    CCTK_REAL_VEC gInv32 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv33 = 
+    CCTK_REAL_VEC gInv33 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma111 = 
+    CCTK_REAL_VEC gamma111 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv11,JacPDstandard2nd1gxx,knmsub(gInv12,JacPDstandard2nd2gxx,kmsub(kmadd(gInv12,JacPDstandard2nd1gxy,kmul(gInv13,JacPDstandard2nd1gxz)),ToReal(2),kmul(gInv13,JacPDstandard2nd3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma211 = 
+    CCTK_REAL_VEC gamma211 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv21,JacPDstandard2nd1gxx,knmsub(gInv22,JacPDstandard2nd2gxx,kmsub(kmadd(gInv22,JacPDstandard2nd1gxy,kmul(gInv23,JacPDstandard2nd1gxz)),ToReal(2),kmul(gInv23,JacPDstandard2nd3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma311 = 
+    CCTK_REAL_VEC gamma311 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv31,JacPDstandard2nd1gxx,knmsub(gInv32,JacPDstandard2nd2gxx,kmsub(kmadd(gInv32,JacPDstandard2nd1gxy,kmul(gInv33,JacPDstandard2nd1gxz)),ToReal(2),kmul(gInv33,JacPDstandard2nd3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma121 = 
+    CCTK_REAL_VEC gamma121 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv12,JacPDstandard2nd1gyy,kmadd(gInv11,JacPDstandard2nd2gxx,kmul(gInv13,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd2gxz,JacPDstandard2nd3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma221 = 
+    CCTK_REAL_VEC gamma221 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv22,JacPDstandard2nd1gyy,kmadd(gInv21,JacPDstandard2nd2gxx,kmul(gInv23,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd2gxz,JacPDstandard2nd3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma321 = 
+    CCTK_REAL_VEC gamma321 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv32,JacPDstandard2nd1gyy,kmadd(gInv31,JacPDstandard2nd2gxx,kmul(gInv33,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd2gxz,JacPDstandard2nd3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma131 = 
+    CCTK_REAL_VEC gamma131 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard2nd1gzz,kmadd(gInv11,JacPDstandard2nd3gxx,kmul(gInv12,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma231 = 
+    CCTK_REAL_VEC gamma231 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard2nd1gzz,kmadd(gInv21,JacPDstandard2nd3gxx,kmul(gInv22,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma331 = 
+    CCTK_REAL_VEC gamma331 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard2nd1gzz,kmadd(gInv31,JacPDstandard2nd3gxx,kmul(gInv32,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma122 = 
+    CCTK_REAL_VEC gamma122 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv12,JacPDstandard2nd2gyy,kmadd(gInv11,kmsub(JacPDstandard2nd2gxy,ToReal(2),JacPDstandard2nd1gyy),kmul(gInv13,kmsub(JacPDstandard2nd2gyz,ToReal(2),JacPDstandard2nd3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma222 = 
+    CCTK_REAL_VEC gamma222 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv22,JacPDstandard2nd2gyy,kmadd(gInv21,kmsub(JacPDstandard2nd2gxy,ToReal(2),JacPDstandard2nd1gyy),kmul(gInv23,kmsub(JacPDstandard2nd2gyz,ToReal(2),JacPDstandard2nd3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma322 = 
+    CCTK_REAL_VEC gamma322 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv32,JacPDstandard2nd2gyy,kmadd(gInv31,kmsub(JacPDstandard2nd2gxy,ToReal(2),JacPDstandard2nd1gyy),kmul(gInv33,kmsub(JacPDstandard2nd2gyz,ToReal(2),JacPDstandard2nd3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma132 = 
+    CCTK_REAL_VEC gamma132 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard2nd2gzz,kmadd(gInv12,JacPDstandard2nd3gyy,kmul(gInv11,kadd(JacPDstandard2nd2gxz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma232 = 
+    CCTK_REAL_VEC gamma232 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard2nd2gzz,kmadd(gInv22,JacPDstandard2nd3gyy,kmul(gInv21,kadd(JacPDstandard2nd2gxz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma332 = 
+    CCTK_REAL_VEC gamma332 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard2nd2gzz,kmadd(gInv32,JacPDstandard2nd3gyy,kmul(gInv31,kadd(JacPDstandard2nd2gxz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma133 = 
+    CCTK_REAL_VEC gamma133 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv13,JacPDstandard2nd3gzz,kmadd(gInv11,kmsub(JacPDstandard2nd3gxz,ToReal(2),JacPDstandard2nd1gzz),kmul(gInv12,kmsub(JacPDstandard2nd3gyz,ToReal(2),JacPDstandard2nd2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma233 = 
+    CCTK_REAL_VEC gamma233 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv23,JacPDstandard2nd3gzz,kmadd(gInv21,kmsub(JacPDstandard2nd3gxz,ToReal(2),JacPDstandard2nd1gzz),kmul(gInv22,kmsub(JacPDstandard2nd3gyz,ToReal(2),JacPDstandard2nd2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma333 = 
+    CCTK_REAL_VEC gamma333 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv33,JacPDstandard2nd3gzz,kmadd(gInv31,kmsub(JacPDstandard2nd3gxz,ToReal(2),JacPDstandard2nd1gzz),kmul(gInv32,kmsub(JacPDstandard2nd3gyz,ToReal(2),JacPDstandard2nd2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED xmoved = ksub(xL,ToReal(xorig));
+    CCTK_REAL_VEC xmoved CCTK_ATTRIBUTE_UNUSED = ksub(xL,ToReal(xorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ymoved = ksub(yL,ToReal(yorig));
+    CCTK_REAL_VEC ymoved CCTK_ATTRIBUTE_UNUSED = ksub(yL,ToReal(yorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED zmoved = ksub(zL,ToReal(zorig));
+    CCTK_REAL_VEC zmoved CCTK_ATTRIBUTE_UNUSED = ksub(zL,ToReal(zorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va1 = kneg(ymoved);
+    CCTK_REAL_VEC va1 CCTK_ATTRIBUTE_UNUSED = kneg(ymoved);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va2 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC va2 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va3 = ToReal(0);
+    CCTK_REAL_VEC va3 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb1 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC vb1 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb2 = ymoved;
+    CCTK_REAL_VEC vb2 CCTK_ATTRIBUTE_UNUSED = ymoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb3 = zmoved;
+    CCTK_REAL_VEC vb3 CCTK_ATTRIBUTE_UNUSED = zmoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc1 = 
+    CCTK_REAL_VEC vc1 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv11,va2,kmul(gInv12,va1)),kmadd(vb1,kmsub(gInv12,va3,kmul(gInv13,va2)),kmul(vb2,kmsub(gInv13,va1,kmul(gInv11,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc2 = 
+    CCTK_REAL_VEC vc2 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv21,va2,kmul(gInv22,va1)),kmadd(vb1,kmsub(gInv22,va3,kmul(gInv23,va2)),kmul(vb2,kmsub(gInv23,va1,kmul(gInv21,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc3 = 
+    CCTK_REAL_VEC vc3 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv31,va2,kmul(gInv32,va1)),kmadd(vb1,kmsub(gInv32,va3,kmul(gInv33,va2)),kmul(vb2,kmsub(gInv33,va1,kmul(gInv31,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa1 = va1;
+    CCTK_REAL_VEC wa1 CCTK_ATTRIBUTE_UNUSED = va1;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa2 = va2;
+    CCTK_REAL_VEC wa2 CCTK_ATTRIBUTE_UNUSED = va2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa3 = va3;
+    CCTK_REAL_VEC wa3 CCTK_ATTRIBUTE_UNUSED = va3;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega11 = 
+    CCTK_REAL_VEC omega11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wa1,wa1),kmadd(gyyL,kmul(wa2,wa2),kmadd(gzzL,kmul(wa3,wa3),kmul(kmadd(gyzL,kmul(wa2,wa3),kmul(wa1,kmadd(gxyL,wa2,kmul(gxzL,wa3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea1 = kdiv(wa1,ksqrt(omega11));
+    CCTK_REAL_VEC ea1 CCTK_ATTRIBUTE_UNUSED = kdiv(wa1,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea2 = kdiv(wa2,ksqrt(omega11));
+    CCTK_REAL_VEC ea2 CCTK_ATTRIBUTE_UNUSED = kdiv(wa2,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea3 = kdiv(wa3,ksqrt(omega11));
+    CCTK_REAL_VEC ea3 CCTK_ATTRIBUTE_UNUSED = kdiv(wa3,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega12 = 
+    CCTK_REAL_VEC omega12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vb1,kmadd(gxyL,vb2,kmul(gxzL,vb3))),kmadd(ea2,kmadd(gxyL,vb1,kmadd(gyyL,vb2,kmul(gyzL,vb3))),kmul(ea3,kmadd(gxzL,vb1,kmadd(gyzL,vb2,kmul(gzzL,vb3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb1 = knmsub(ea1,omega12,vb1);
+    CCTK_REAL_VEC wb1 CCTK_ATTRIBUTE_UNUSED = knmsub(ea1,omega12,vb1);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb2 = knmsub(ea2,omega12,vb2);
+    CCTK_REAL_VEC wb2 CCTK_ATTRIBUTE_UNUSED = knmsub(ea2,omega12,vb2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb3 = knmsub(ea3,omega12,vb3);
+    CCTK_REAL_VEC wb3 CCTK_ATTRIBUTE_UNUSED = knmsub(ea3,omega12,vb3);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega22 = 
+    CCTK_REAL_VEC omega22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wb1,wb1),kmadd(gyyL,kmul(wb2,wb2),kmadd(gzzL,kmul(wb3,wb3),kmul(kmadd(gyzL,kmul(wb2,wb3),kmul(wb1,kmadd(gxyL,wb2,kmul(gxzL,wb3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb1 = kdiv(wb1,ksqrt(omega22));
+    CCTK_REAL_VEC eb1 CCTK_ATTRIBUTE_UNUSED = kdiv(wb1,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb2 = kdiv(wb2,ksqrt(omega22));
+    CCTK_REAL_VEC eb2 CCTK_ATTRIBUTE_UNUSED = kdiv(wb2,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb3 = kdiv(wb3,ksqrt(omega22));
+    CCTK_REAL_VEC eb3 CCTK_ATTRIBUTE_UNUSED = kdiv(wb3,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega13 = 
+    CCTK_REAL_VEC omega13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(ea2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(ea3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega23 = 
+    CCTK_REAL_VEC omega23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(eb1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(eb2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(eb3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc1 = 
+    CCTK_REAL_VEC wc1 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc1,kmadd(eb1,omega23,kmul(ea1,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc2 = 
+    CCTK_REAL_VEC wc2 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc2,kmadd(eb2,omega23,kmul(ea2,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc3 = 
+    CCTK_REAL_VEC wc3 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc3,kmadd(eb3,omega23,kmul(ea3,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega33 = 
+    CCTK_REAL_VEC omega33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wc1,wc1),kmadd(gyyL,kmul(wc2,wc2),kmadd(gzzL,kmul(wc3,wc3),kmul(kmadd(gyzL,kmul(wc2,wc3),kmul(wc1,kmadd(gxyL,wc2,kmul(gxzL,wc3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec1 = kdiv(wc1,ksqrt(omega33));
+    CCTK_REAL_VEC ec1 CCTK_ATTRIBUTE_UNUSED = kdiv(wc1,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec2 = kdiv(wc2,ksqrt(omega33));
+    CCTK_REAL_VEC ec2 CCTK_ATTRIBUTE_UNUSED = kdiv(wc2,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec3 = kdiv(wc3,ksqrt(omega33));
+    CCTK_REAL_VEC ec3 CCTK_ATTRIBUTE_UNUSED = kdiv(wc3,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED isqrt2 = 
+    CCTK_REAL_VEC isqrt2 CCTK_ATTRIBUTE_UNUSED = 
       ToReal(0.707106781186547524);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n1 = kneg(kmul(eb1,isqrt2));
+    CCTK_REAL_VEC n1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n2 = kneg(kmul(eb2,isqrt2));
+    CCTK_REAL_VEC n2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n3 = kneg(kmul(eb3,isqrt2));
+    CCTK_REAL_VEC n3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rm1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rm2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rm3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im1 = kmul(ea1,isqrt2);
+    CCTK_REAL_VEC im1 CCTK_ATTRIBUTE_UNUSED = kmul(ea1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im2 = kmul(ea2,isqrt2);
+    CCTK_REAL_VEC im2 CCTK_ATTRIBUTE_UNUSED = kmul(ea2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im3 = kmul(ea3,isqrt2);
+    CCTK_REAL_VEC im3 CCTK_ATTRIBUTE_UNUSED = kmul(ea3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rmbar1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rmbar2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rmbar3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar1 = kneg(kmul(ea1,isqrt2));
+    CCTK_REAL_VEC imbar1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar2 = kneg(kmul(ea2,isqrt2));
+    CCTK_REAL_VEC imbar2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar3 = kneg(kmul(ea3,isqrt2));
+    CCTK_REAL_VEC imbar3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED nn = isqrt2;
+    CCTK_REAL_VEC nn CCTK_ATTRIBUTE_UNUSED = isqrt2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1212 = 
+    CCTK_REAL_VEC R1212 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd12gxy,kadd(JacPDstandard2nd21gxy,kmadd(kmadd(gamma122,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma222,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma322))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma221,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(gamma321,kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321)))))),ToReal(2),JacPDstandard2nd22gxx),JacPDstandard2nd11gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1213 = 
+    CCTK_REAL_VEC R1213 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd12gxz,kadd(JacPDstandard2nd31gxy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma232,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma221,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma321,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard2nd23gxx),JacPDstandard2nd11gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1223 = 
+    CCTK_REAL_VEC R1223 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd22gxz,kadd(JacPDstandard2nd31gyy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma232,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma122,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma222,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma322,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard2nd23gxy),JacPDstandard2nd12gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1313 = 
+    CCTK_REAL_VEC R1313 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd13gxz,kadd(JacPDstandard2nd31gxz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma233,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma131,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma231,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma331,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard2nd33gxx),JacPDstandard2nd11gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1323 = 
+    CCTK_REAL_VEC R1323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd23gxz,kadd(JacPDstandard2nd31gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma233,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma232,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331))),gamma332))),ToReal(2),JacPDstandard2nd33gxy),JacPDstandard2nd12gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R2323 = 
+    CCTK_REAL_VEC R2323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd23gyz,kadd(JacPDstandard2nd32gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma122,kmadd(gxyL,gamma222,kmul(gxzL,gamma322))),kmadd(gamma233,kmadd(gxyL,gamma122,kmadd(gyyL,gamma222,kmul(gyzL,gamma322))),kmul(kmadd(gxzL,gamma122,kmadd(gyzL,gamma222,kmul(gzzL,gamma322))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma132,kmadd(gxyL,gamma232,kmul(gxzL,gamma332))),kmadd(gamma232,kmadd(gxyL,gamma132,kmadd(gyyL,gamma232,kmul(gyzL,gamma332))),kmul(gamma332,kmadd(gxzL,gamma132,kmadd(gyzL,gamma232,kmul(gzzL,gamma332)))))),ToReal(2),JacPDstandard2nd33gyy),JacPDstandard2nd22gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1212 = 
+    CCTK_REAL_VEC R4p1212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1213 = 
+    CCTK_REAL_VEC R4p1213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1223 = 
+    CCTK_REAL_VEC R4p1223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kyzL,knmsub(kxzL,kyyL,R1223));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1313 = 
+    CCTK_REAL_VEC R4p1313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1323 = 
+    CCTK_REAL_VEC R4p1323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p2323 = 
+    CCTK_REAL_VEC R4p2323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro111 = ToReal(0);
+    CCTK_REAL_VEC Ro111 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro112 = 
+    CCTK_REAL_VEC Ro112 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma121,kmadd(kxzL,gamma321,kadd(JacPDstandard2nd1kxy,knmsub(kyyL,gamma211,knmsub(kyzL,gamma311,kmsub(kxyL,ksub(gamma221,gamma111),JacPDstandard2nd2kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro113 = 
+    CCTK_REAL_VEC Ro113 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma131,kmadd(kxyL,gamma231,kadd(JacPDstandard2nd1kxz,knmsub(kyzL,gamma211,knmsub(kzzL,gamma311,kmsub(kxzL,ksub(gamma331,gamma111),JacPDstandard2nd3kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro121 = 
+    CCTK_REAL_VEC Ro121 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma211,kmadd(kyzL,gamma311,kadd(JacPDstandard2nd2kxx,knmsub(kxxL,gamma121,knmsub(kxzL,gamma321,kmsub(kxyL,ksub(gamma111,gamma221),JacPDstandard2nd1kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro122 = ToReal(0);
+    CCTK_REAL_VEC Ro122 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro123 = 
+    CCTK_REAL_VEC Ro123 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma131,kmadd(kyyL,gamma231,kadd(JacPDstandard2nd2kxz,knmsub(kxzL,gamma121,knmsub(kzzL,gamma321,kmsub(kyzL,ksub(gamma331,gamma221),JacPDstandard2nd3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro131 = 
+    CCTK_REAL_VEC Ro131 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma211,kmadd(kzzL,gamma311,kadd(JacPDstandard2nd3kxx,knmsub(kxxL,gamma131,knmsub(kxyL,gamma231,kmsub(kxzL,ksub(gamma111,gamma331),JacPDstandard2nd1kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro132 = 
+    CCTK_REAL_VEC Ro132 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma121,kmadd(kzzL,gamma321,kadd(JacPDstandard2nd3kxy,knmsub(kxyL,gamma131,knmsub(kyyL,gamma231,kmsub(kyzL,ksub(gamma221,gamma331),JacPDstandard2nd2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro133 = ToReal(0);
+    CCTK_REAL_VEC Ro133 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro211 = ToReal(0);
+    CCTK_REAL_VEC Ro211 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro212 = 
+    CCTK_REAL_VEC Ro212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma122,kmadd(kxzL,gamma322,kadd(JacPDstandard2nd1kyy,knmsub(kyyL,gamma221,knmsub(kyzL,gamma321,kmsub(kxyL,ksub(gamma222,gamma121),JacPDstandard2nd2kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro213 = 
+    CCTK_REAL_VEC Ro213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxyL,gamma232,kadd(JacPDstandard2nd1kyz,knmsub(kyzL,gamma221,knmsub(kzzL,gamma321,kmsub(kxzL,ksub(gamma332,gamma121),JacPDstandard2nd3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro221 = 
+    CCTK_REAL_VEC Ro221 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma221,kmadd(kyzL,gamma321,kadd(JacPDstandard2nd2kxy,knmsub(kxxL,gamma122,knmsub(kxzL,gamma322,kmsub(kxyL,ksub(gamma121,gamma222),JacPDstandard2nd1kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro222 = ToReal(0);
+    CCTK_REAL_VEC Ro222 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro223 = 
+    CCTK_REAL_VEC Ro223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma132,kmadd(kyyL,gamma232,kadd(JacPDstandard2nd2kyz,knmsub(kxzL,gamma122,knmsub(kzzL,gamma322,kmsub(kyzL,ksub(gamma332,gamma222),JacPDstandard2nd3kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro231 = 
+    CCTK_REAL_VEC Ro231 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma221,kmadd(kzzL,gamma321,kadd(JacPDstandard2nd3kxy,knmsub(kxxL,gamma132,knmsub(kxyL,gamma232,kmsub(kxzL,ksub(gamma121,gamma332),JacPDstandard2nd1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro232 = 
+    CCTK_REAL_VEC Ro232 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma122,kmadd(kzzL,gamma322,kadd(JacPDstandard2nd3kyy,knmsub(kxyL,gamma132,knmsub(kyyL,gamma232,kmsub(kyzL,ksub(gamma222,gamma332),JacPDstandard2nd2kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro233 = ToReal(0);
+    CCTK_REAL_VEC Ro233 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro311 = ToReal(0);
+    CCTK_REAL_VEC Ro311 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro312 = 
+    CCTK_REAL_VEC Ro312 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxzL,gamma332,kadd(JacPDstandard2nd1kyz,knmsub(kyyL,gamma231,knmsub(kyzL,gamma331,kmsub(kxyL,ksub(gamma232,gamma131),JacPDstandard2nd2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro313 = 
+    CCTK_REAL_VEC Ro313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma133,kmadd(kxyL,gamma233,kadd(JacPDstandard2nd1kzz,knmsub(kyzL,gamma231,knmsub(kzzL,gamma331,kmsub(kxzL,ksub(gamma333,gamma131),JacPDstandard2nd3kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro321 = 
+    CCTK_REAL_VEC Ro321 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma231,kmadd(kyzL,gamma331,kadd(JacPDstandard2nd2kxz,knmsub(kxxL,gamma132,knmsub(kxzL,gamma332,kmsub(kxyL,ksub(gamma131,gamma232),JacPDstandard2nd1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro322 = ToReal(0);
+    CCTK_REAL_VEC Ro322 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro323 = 
+    CCTK_REAL_VEC Ro323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma133,kmadd(kyyL,gamma233,kadd(JacPDstandard2nd2kzz,knmsub(kxzL,gamma132,knmsub(kzzL,gamma332,kmsub(kyzL,ksub(gamma333,gamma232),JacPDstandard2nd3kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro331 = 
+    CCTK_REAL_VEC Ro331 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma231,kmadd(kzzL,gamma331,kadd(JacPDstandard2nd3kxz,knmsub(kxxL,gamma133,knmsub(kxyL,gamma233,kmsub(kxzL,ksub(gamma131,gamma333),JacPDstandard2nd1kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro332 = 
+    CCTK_REAL_VEC Ro332 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma132,kmadd(kzzL,gamma332,kadd(JacPDstandard2nd3kyz,knmsub(kxyL,gamma133,knmsub(kyyL,gamma233,kmsub(kyzL,ksub(gamma232,gamma333),JacPDstandard2nd2kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro333 = ToReal(0);
+    CCTK_REAL_VEC Ro333 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo11 = 
+    CCTK_REAL_VEC Rojo11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv23,gInv32),kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv22,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo12 = 
+    CCTK_REAL_VEC Rojo12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv23,R1223,knmsub(gInv21,R1212,knmsub(gInv31,R1213,kmadd(gInv12,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv32,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo13 = 
+    CCTK_REAL_VEC Rojo13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv23),kmadd(gInv13,kmul(kxzL,kxzL),knmsub(gInv21,R1213,knmsub(gInv31,R1313,knmsub(gInv32,R1323,kmadd(gInv12,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv23,kmul(kxxL,gInv13))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo21 = 
+    CCTK_REAL_VEC Rojo21 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv32,R1223,knmsub(gInv12,R1212,knmsub(gInv13,R1213,kmadd(gInv21,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv23,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo22 = 
+    CCTK_REAL_VEC Rojo22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv13,gInv31),kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmadd(gInv11,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo23 = 
+    CCTK_REAL_VEC Rojo23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv12,R1223,knmsub(gInv31,R1323,knmsub(gInv32,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv21,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv23,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo31 = 
+    CCTK_REAL_VEC Rojo31 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv32),kmadd(gInv31,kmul(kxzL,kxzL),knmsub(gInv12,R1213,knmsub(gInv13,R1313,knmsub(gInv23,R1323,kmadd(gInv21,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv32,kmul(kxxL,gInv31))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo32 = 
+    CCTK_REAL_VEC Rojo32 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv21,R1223,knmsub(gInv13,R1323,knmsub(gInv23,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv12,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv32,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo33 = 
+    CCTK_REAL_VEC Rojo33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv12,gInv21),kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)),kmadd(gInv11,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)),kmul(gInv22,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4rL = 
+    CCTK_REAL_VEC Psi4rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2)))))),kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),knmsub(kmul(nn,nn),kmadd(imbar1,kmadd(imbar2,kadd(Rojo12,Rojo21),kmul(imbar3,kadd(Rojo13,Rojo31))),knmsub(rmbar1,kmadd(rmbar2,kadd(Rojo12,Rojo21),kmul(rmbar3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo32,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo11,kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(Rojo22,kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),kmul(Rojo33,kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3))))))))),kmsub(kmadd(kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmsub(imbar1,imbar2,kmul(rmbar1,rmbar2)),kmadd(kmadd(n1,kmul(n2,R4p1213),kmadd(n1,kmul(n3,R4p1313),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2))))),kmsub(imbar1,imbar3,kmul(rmbar1,rmbar3)),kmadd(kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmul(nn,kmadd(kmadd(n1,Ro112,kmadd(n2,Ro122,kmul(n3,Ro132))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro211,kmadd(n2,Ro221,kmul(n3,Ro231))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro113,kmadd(n2,Ro123,kmul(n3,Ro133))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro311,kmadd(n2,Ro321,kmul(n3,Ro331))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro213,kmadd(n2,Ro223,kmul(n3,Ro233))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro312,kmadd(n2,Ro322,kmul(n3,Ro332))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131))),kmsub(rmbar1,rmbar1,kmul(imbar1,imbar1)),kmadd(kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232))),kmsub(rmbar2,rmbar2,kmul(imbar2,imbar2)),kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),kmsub(rmbar3,rmbar3,kmul(imbar3,imbar3))))))))))))))),ToReal(2),kmadd(kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3)),kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4iL = 
+    CCTK_REAL_VEC Psi4iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kmadd(n2,R4p1213,kmul(n3,R4p1313)),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2)))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmul(nn,kmadd(kmadd(im1,kmul(rm1,kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131)))),kmul(im2,kmul(rm2,kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232)))))),ToReal(-2),kmsub(im3,kmul(rm3,kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),ToReal(-2))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(n1,kadd(Ro211,Ro112),kmadd(n3,kadd(Ro231,Ro132),kmul(n2,kadd(Ro221,Ro122)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(n1,kadd(Ro312,Ro213),kmadd(n3,kadd(Ro332,Ro233),kmul(n2,kadd(Ro322,Ro223)))),kmul(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kadd(Ro311,Ro113),kmadd(n3,kadd(Ro331,Ro133),kmul(n2,kadd(Ro321,Ro123)))))))))))),ToReal(2),kmsub(ToReal(-2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2))))))),kmul(im3,kmul(rm3,kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_psi4_calc_4th.cc b/src/WeylScal4_psi4_calc_4th.cc
index 92803bd..0c75849 100644
--- a/src/WeylScal4_psi4_calc_4th.cc
+++ b/src/WeylScal4_psi4_calc_4th.cc
@@ -68,13 +68,18 @@ static void WeylScal4_psi4_calc_4th_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -119,9 +124,9 @@ static void WeylScal4_psi4_calc_4th_Body(const cGH* restrict const cctkGH, const
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -138,26 +143,6 @@ static void WeylScal4_psi4_calc_4th_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -995,350 +980,350 @@ static void WeylScal4_psi4_calc_4th_Body(const cGH* restrict const cctkGH, const
       JacPDstandard4th32gyz = PDstandard4th23gyz;
     }
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED detg = 
+    CCTK_REAL_VEC detg CCTK_ATTRIBUTE_UNUSED = 
       knmsub(gyyL,kmul(gxzL,gxzL),knmsub(gxxL,kmul(gyzL,gyzL),kmadd(gzzL,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)),kmul(gxyL,kmul(gxzL,kmul(gyzL,ToReal(2)))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED invdetg = kdiv(ToReal(1),detg);
+    CCTK_REAL_VEC invdetg CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(1),detg);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv11 = 
+    CCTK_REAL_VEC gInv11 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gyyL,gzzL,kmul(gyzL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv12 = 
+    CCTK_REAL_VEC gInv12 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv13 = 
+    CCTK_REAL_VEC gInv13 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv21 = 
+    CCTK_REAL_VEC gInv21 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv22 = 
+    CCTK_REAL_VEC gInv22 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gzzL,kmul(gxzL,gxzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv23 = 
+    CCTK_REAL_VEC gInv23 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv31 = 
+    CCTK_REAL_VEC gInv31 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv32 = 
+    CCTK_REAL_VEC gInv32 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv33 = 
+    CCTK_REAL_VEC gInv33 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma111 = 
+    CCTK_REAL_VEC gamma111 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv11,JacPDstandard4th1gxx,knmsub(gInv12,JacPDstandard4th2gxx,kmsub(kmadd(gInv12,JacPDstandard4th1gxy,kmul(gInv13,JacPDstandard4th1gxz)),ToReal(2),kmul(gInv13,JacPDstandard4th3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma211 = 
+    CCTK_REAL_VEC gamma211 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv21,JacPDstandard4th1gxx,knmsub(gInv22,JacPDstandard4th2gxx,kmsub(kmadd(gInv22,JacPDstandard4th1gxy,kmul(gInv23,JacPDstandard4th1gxz)),ToReal(2),kmul(gInv23,JacPDstandard4th3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma311 = 
+    CCTK_REAL_VEC gamma311 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv31,JacPDstandard4th1gxx,knmsub(gInv32,JacPDstandard4th2gxx,kmsub(kmadd(gInv32,JacPDstandard4th1gxy,kmul(gInv33,JacPDstandard4th1gxz)),ToReal(2),kmul(gInv33,JacPDstandard4th3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma121 = 
+    CCTK_REAL_VEC gamma121 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv12,JacPDstandard4th1gyy,kmadd(gInv11,JacPDstandard4th2gxx,kmul(gInv13,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th2gxz,JacPDstandard4th3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma221 = 
+    CCTK_REAL_VEC gamma221 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv22,JacPDstandard4th1gyy,kmadd(gInv21,JacPDstandard4th2gxx,kmul(gInv23,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th2gxz,JacPDstandard4th3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma321 = 
+    CCTK_REAL_VEC gamma321 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv32,JacPDstandard4th1gyy,kmadd(gInv31,JacPDstandard4th2gxx,kmul(gInv33,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th2gxz,JacPDstandard4th3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma131 = 
+    CCTK_REAL_VEC gamma131 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard4th1gzz,kmadd(gInv11,JacPDstandard4th3gxx,kmul(gInv12,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th3gxy,JacPDstandard4th2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma231 = 
+    CCTK_REAL_VEC gamma231 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard4th1gzz,kmadd(gInv21,JacPDstandard4th3gxx,kmul(gInv22,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th3gxy,JacPDstandard4th2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma331 = 
+    CCTK_REAL_VEC gamma331 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard4th1gzz,kmadd(gInv31,JacPDstandard4th3gxx,kmul(gInv32,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th3gxy,JacPDstandard4th2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma122 = 
+    CCTK_REAL_VEC gamma122 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv12,JacPDstandard4th2gyy,kmadd(gInv11,kmsub(JacPDstandard4th2gxy,ToReal(2),JacPDstandard4th1gyy),kmul(gInv13,kmsub(JacPDstandard4th2gyz,ToReal(2),JacPDstandard4th3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma222 = 
+    CCTK_REAL_VEC gamma222 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv22,JacPDstandard4th2gyy,kmadd(gInv21,kmsub(JacPDstandard4th2gxy,ToReal(2),JacPDstandard4th1gyy),kmul(gInv23,kmsub(JacPDstandard4th2gyz,ToReal(2),JacPDstandard4th3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma322 = 
+    CCTK_REAL_VEC gamma322 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv32,JacPDstandard4th2gyy,kmadd(gInv31,kmsub(JacPDstandard4th2gxy,ToReal(2),JacPDstandard4th1gyy),kmul(gInv33,kmsub(JacPDstandard4th2gyz,ToReal(2),JacPDstandard4th3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma132 = 
+    CCTK_REAL_VEC gamma132 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard4th2gzz,kmadd(gInv12,JacPDstandard4th3gyy,kmul(gInv11,kadd(JacPDstandard4th2gxz,ksub(JacPDstandard4th3gxy,JacPDstandard4th1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma232 = 
+    CCTK_REAL_VEC gamma232 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard4th2gzz,kmadd(gInv22,JacPDstandard4th3gyy,kmul(gInv21,kadd(JacPDstandard4th2gxz,ksub(JacPDstandard4th3gxy,JacPDstandard4th1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma332 = 
+    CCTK_REAL_VEC gamma332 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard4th2gzz,kmadd(gInv32,JacPDstandard4th3gyy,kmul(gInv31,kadd(JacPDstandard4th2gxz,ksub(JacPDstandard4th3gxy,JacPDstandard4th1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma133 = 
+    CCTK_REAL_VEC gamma133 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv13,JacPDstandard4th3gzz,kmadd(gInv11,kmsub(JacPDstandard4th3gxz,ToReal(2),JacPDstandard4th1gzz),kmul(gInv12,kmsub(JacPDstandard4th3gyz,ToReal(2),JacPDstandard4th2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma233 = 
+    CCTK_REAL_VEC gamma233 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv23,JacPDstandard4th3gzz,kmadd(gInv21,kmsub(JacPDstandard4th3gxz,ToReal(2),JacPDstandard4th1gzz),kmul(gInv22,kmsub(JacPDstandard4th3gyz,ToReal(2),JacPDstandard4th2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma333 = 
+    CCTK_REAL_VEC gamma333 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv33,JacPDstandard4th3gzz,kmadd(gInv31,kmsub(JacPDstandard4th3gxz,ToReal(2),JacPDstandard4th1gzz),kmul(gInv32,kmsub(JacPDstandard4th3gyz,ToReal(2),JacPDstandard4th2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED xmoved = ksub(xL,ToReal(xorig));
+    CCTK_REAL_VEC xmoved CCTK_ATTRIBUTE_UNUSED = ksub(xL,ToReal(xorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ymoved = ksub(yL,ToReal(yorig));
+    CCTK_REAL_VEC ymoved CCTK_ATTRIBUTE_UNUSED = ksub(yL,ToReal(yorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED zmoved = ksub(zL,ToReal(zorig));
+    CCTK_REAL_VEC zmoved CCTK_ATTRIBUTE_UNUSED = ksub(zL,ToReal(zorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va1 = kneg(ymoved);
+    CCTK_REAL_VEC va1 CCTK_ATTRIBUTE_UNUSED = kneg(ymoved);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va2 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC va2 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va3 = ToReal(0);
+    CCTK_REAL_VEC va3 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb1 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC vb1 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb2 = ymoved;
+    CCTK_REAL_VEC vb2 CCTK_ATTRIBUTE_UNUSED = ymoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb3 = zmoved;
+    CCTK_REAL_VEC vb3 CCTK_ATTRIBUTE_UNUSED = zmoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc1 = 
+    CCTK_REAL_VEC vc1 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv11,va2,kmul(gInv12,va1)),kmadd(vb1,kmsub(gInv12,va3,kmul(gInv13,va2)),kmul(vb2,kmsub(gInv13,va1,kmul(gInv11,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc2 = 
+    CCTK_REAL_VEC vc2 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv21,va2,kmul(gInv22,va1)),kmadd(vb1,kmsub(gInv22,va3,kmul(gInv23,va2)),kmul(vb2,kmsub(gInv23,va1,kmul(gInv21,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc3 = 
+    CCTK_REAL_VEC vc3 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv31,va2,kmul(gInv32,va1)),kmadd(vb1,kmsub(gInv32,va3,kmul(gInv33,va2)),kmul(vb2,kmsub(gInv33,va1,kmul(gInv31,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa1 = va1;
+    CCTK_REAL_VEC wa1 CCTK_ATTRIBUTE_UNUSED = va1;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa2 = va2;
+    CCTK_REAL_VEC wa2 CCTK_ATTRIBUTE_UNUSED = va2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa3 = va3;
+    CCTK_REAL_VEC wa3 CCTK_ATTRIBUTE_UNUSED = va3;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega11 = 
+    CCTK_REAL_VEC omega11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wa1,wa1),kmadd(gyyL,kmul(wa2,wa2),kmadd(gzzL,kmul(wa3,wa3),kmul(kmadd(gyzL,kmul(wa2,wa3),kmul(wa1,kmadd(gxyL,wa2,kmul(gxzL,wa3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea1 = kdiv(wa1,ksqrt(omega11));
+    CCTK_REAL_VEC ea1 CCTK_ATTRIBUTE_UNUSED = kdiv(wa1,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea2 = kdiv(wa2,ksqrt(omega11));
+    CCTK_REAL_VEC ea2 CCTK_ATTRIBUTE_UNUSED = kdiv(wa2,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea3 = kdiv(wa3,ksqrt(omega11));
+    CCTK_REAL_VEC ea3 CCTK_ATTRIBUTE_UNUSED = kdiv(wa3,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega12 = 
+    CCTK_REAL_VEC omega12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vb1,kmadd(gxyL,vb2,kmul(gxzL,vb3))),kmadd(ea2,kmadd(gxyL,vb1,kmadd(gyyL,vb2,kmul(gyzL,vb3))),kmul(ea3,kmadd(gxzL,vb1,kmadd(gyzL,vb2,kmul(gzzL,vb3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb1 = knmsub(ea1,omega12,vb1);
+    CCTK_REAL_VEC wb1 CCTK_ATTRIBUTE_UNUSED = knmsub(ea1,omega12,vb1);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb2 = knmsub(ea2,omega12,vb2);
+    CCTK_REAL_VEC wb2 CCTK_ATTRIBUTE_UNUSED = knmsub(ea2,omega12,vb2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb3 = knmsub(ea3,omega12,vb3);
+    CCTK_REAL_VEC wb3 CCTK_ATTRIBUTE_UNUSED = knmsub(ea3,omega12,vb3);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega22 = 
+    CCTK_REAL_VEC omega22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wb1,wb1),kmadd(gyyL,kmul(wb2,wb2),kmadd(gzzL,kmul(wb3,wb3),kmul(kmadd(gyzL,kmul(wb2,wb3),kmul(wb1,kmadd(gxyL,wb2,kmul(gxzL,wb3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb1 = kdiv(wb1,ksqrt(omega22));
+    CCTK_REAL_VEC eb1 CCTK_ATTRIBUTE_UNUSED = kdiv(wb1,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb2 = kdiv(wb2,ksqrt(omega22));
+    CCTK_REAL_VEC eb2 CCTK_ATTRIBUTE_UNUSED = kdiv(wb2,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb3 = kdiv(wb3,ksqrt(omega22));
+    CCTK_REAL_VEC eb3 CCTK_ATTRIBUTE_UNUSED = kdiv(wb3,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega13 = 
+    CCTK_REAL_VEC omega13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(ea2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(ea3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega23 = 
+    CCTK_REAL_VEC omega23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(eb1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(eb2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(eb3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc1 = 
+    CCTK_REAL_VEC wc1 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc1,kmadd(eb1,omega23,kmul(ea1,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc2 = 
+    CCTK_REAL_VEC wc2 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc2,kmadd(eb2,omega23,kmul(ea2,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc3 = 
+    CCTK_REAL_VEC wc3 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc3,kmadd(eb3,omega23,kmul(ea3,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega33 = 
+    CCTK_REAL_VEC omega33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wc1,wc1),kmadd(gyyL,kmul(wc2,wc2),kmadd(gzzL,kmul(wc3,wc3),kmul(kmadd(gyzL,kmul(wc2,wc3),kmul(wc1,kmadd(gxyL,wc2,kmul(gxzL,wc3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec1 = kdiv(wc1,ksqrt(omega33));
+    CCTK_REAL_VEC ec1 CCTK_ATTRIBUTE_UNUSED = kdiv(wc1,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec2 = kdiv(wc2,ksqrt(omega33));
+    CCTK_REAL_VEC ec2 CCTK_ATTRIBUTE_UNUSED = kdiv(wc2,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec3 = kdiv(wc3,ksqrt(omega33));
+    CCTK_REAL_VEC ec3 CCTK_ATTRIBUTE_UNUSED = kdiv(wc3,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED isqrt2 = 
+    CCTK_REAL_VEC isqrt2 CCTK_ATTRIBUTE_UNUSED = 
       ToReal(0.707106781186547524);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n1 = kneg(kmul(eb1,isqrt2));
+    CCTK_REAL_VEC n1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n2 = kneg(kmul(eb2,isqrt2));
+    CCTK_REAL_VEC n2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n3 = kneg(kmul(eb3,isqrt2));
+    CCTK_REAL_VEC n3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rm1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rm2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rm3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im1 = kmul(ea1,isqrt2);
+    CCTK_REAL_VEC im1 CCTK_ATTRIBUTE_UNUSED = kmul(ea1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im2 = kmul(ea2,isqrt2);
+    CCTK_REAL_VEC im2 CCTK_ATTRIBUTE_UNUSED = kmul(ea2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im3 = kmul(ea3,isqrt2);
+    CCTK_REAL_VEC im3 CCTK_ATTRIBUTE_UNUSED = kmul(ea3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rmbar1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rmbar2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rmbar3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar1 = kneg(kmul(ea1,isqrt2));
+    CCTK_REAL_VEC imbar1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar2 = kneg(kmul(ea2,isqrt2));
+    CCTK_REAL_VEC imbar2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar3 = kneg(kmul(ea3,isqrt2));
+    CCTK_REAL_VEC imbar3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED nn = isqrt2;
+    CCTK_REAL_VEC nn CCTK_ATTRIBUTE_UNUSED = isqrt2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1212 = 
+    CCTK_REAL_VEC R1212 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th12gxy,kadd(JacPDstandard4th21gxy,kmadd(kmadd(gamma122,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma222,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma322))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma221,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(gamma321,kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321)))))),ToReal(2),JacPDstandard4th22gxx),JacPDstandard4th11gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1213 = 
+    CCTK_REAL_VEC R1213 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th12gxz,kadd(JacPDstandard4th31gxy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma232,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma221,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma321,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard4th23gxx),JacPDstandard4th11gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1223 = 
+    CCTK_REAL_VEC R1223 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th22gxz,kadd(JacPDstandard4th31gyy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma232,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma122,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma222,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma322,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard4th23gxy),JacPDstandard4th12gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1313 = 
+    CCTK_REAL_VEC R1313 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th13gxz,kadd(JacPDstandard4th31gxz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma233,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma131,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma231,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma331,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard4th33gxx),JacPDstandard4th11gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1323 = 
+    CCTK_REAL_VEC R1323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th23gxz,kadd(JacPDstandard4th31gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma233,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma232,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331))),gamma332))),ToReal(2),JacPDstandard4th33gxy),JacPDstandard4th12gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R2323 = 
+    CCTK_REAL_VEC R2323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th23gyz,kadd(JacPDstandard4th32gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma122,kmadd(gxyL,gamma222,kmul(gxzL,gamma322))),kmadd(gamma233,kmadd(gxyL,gamma122,kmadd(gyyL,gamma222,kmul(gyzL,gamma322))),kmul(kmadd(gxzL,gamma122,kmadd(gyzL,gamma222,kmul(gzzL,gamma322))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma132,kmadd(gxyL,gamma232,kmul(gxzL,gamma332))),kmadd(gamma232,kmadd(gxyL,gamma132,kmadd(gyyL,gamma232,kmul(gyzL,gamma332))),kmul(gamma332,kmadd(gxzL,gamma132,kmadd(gyzL,gamma232,kmul(gzzL,gamma332)))))),ToReal(2),JacPDstandard4th33gyy),JacPDstandard4th22gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1212 = 
+    CCTK_REAL_VEC R4p1212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1213 = 
+    CCTK_REAL_VEC R4p1213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1223 = 
+    CCTK_REAL_VEC R4p1223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kyzL,knmsub(kxzL,kyyL,R1223));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1313 = 
+    CCTK_REAL_VEC R4p1313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1323 = 
+    CCTK_REAL_VEC R4p1323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p2323 = 
+    CCTK_REAL_VEC R4p2323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro111 = ToReal(0);
+    CCTK_REAL_VEC Ro111 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro112 = 
+    CCTK_REAL_VEC Ro112 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma121,kmadd(kxzL,gamma321,kadd(JacPDstandard4th1kxy,knmsub(kyyL,gamma211,knmsub(kyzL,gamma311,kmsub(kxyL,ksub(gamma221,gamma111),JacPDstandard4th2kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro113 = 
+    CCTK_REAL_VEC Ro113 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma131,kmadd(kxyL,gamma231,kadd(JacPDstandard4th1kxz,knmsub(kyzL,gamma211,knmsub(kzzL,gamma311,kmsub(kxzL,ksub(gamma331,gamma111),JacPDstandard4th3kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro121 = 
+    CCTK_REAL_VEC Ro121 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma211,kmadd(kyzL,gamma311,kadd(JacPDstandard4th2kxx,knmsub(kxxL,gamma121,knmsub(kxzL,gamma321,kmsub(kxyL,ksub(gamma111,gamma221),JacPDstandard4th1kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro122 = ToReal(0);
+    CCTK_REAL_VEC Ro122 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro123 = 
+    CCTK_REAL_VEC Ro123 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma131,kmadd(kyyL,gamma231,kadd(JacPDstandard4th2kxz,knmsub(kxzL,gamma121,knmsub(kzzL,gamma321,kmsub(kyzL,ksub(gamma331,gamma221),JacPDstandard4th3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro131 = 
+    CCTK_REAL_VEC Ro131 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma211,kmadd(kzzL,gamma311,kadd(JacPDstandard4th3kxx,knmsub(kxxL,gamma131,knmsub(kxyL,gamma231,kmsub(kxzL,ksub(gamma111,gamma331),JacPDstandard4th1kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro132 = 
+    CCTK_REAL_VEC Ro132 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma121,kmadd(kzzL,gamma321,kadd(JacPDstandard4th3kxy,knmsub(kxyL,gamma131,knmsub(kyyL,gamma231,kmsub(kyzL,ksub(gamma221,gamma331),JacPDstandard4th2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro133 = ToReal(0);
+    CCTK_REAL_VEC Ro133 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro211 = ToReal(0);
+    CCTK_REAL_VEC Ro211 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro212 = 
+    CCTK_REAL_VEC Ro212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma122,kmadd(kxzL,gamma322,kadd(JacPDstandard4th1kyy,knmsub(kyyL,gamma221,knmsub(kyzL,gamma321,kmsub(kxyL,ksub(gamma222,gamma121),JacPDstandard4th2kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro213 = 
+    CCTK_REAL_VEC Ro213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxyL,gamma232,kadd(JacPDstandard4th1kyz,knmsub(kyzL,gamma221,knmsub(kzzL,gamma321,kmsub(kxzL,ksub(gamma332,gamma121),JacPDstandard4th3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro221 = 
+    CCTK_REAL_VEC Ro221 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma221,kmadd(kyzL,gamma321,kadd(JacPDstandard4th2kxy,knmsub(kxxL,gamma122,knmsub(kxzL,gamma322,kmsub(kxyL,ksub(gamma121,gamma222),JacPDstandard4th1kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro222 = ToReal(0);
+    CCTK_REAL_VEC Ro222 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro223 = 
+    CCTK_REAL_VEC Ro223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma132,kmadd(kyyL,gamma232,kadd(JacPDstandard4th2kyz,knmsub(kxzL,gamma122,knmsub(kzzL,gamma322,kmsub(kyzL,ksub(gamma332,gamma222),JacPDstandard4th3kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro231 = 
+    CCTK_REAL_VEC Ro231 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma221,kmadd(kzzL,gamma321,kadd(JacPDstandard4th3kxy,knmsub(kxxL,gamma132,knmsub(kxyL,gamma232,kmsub(kxzL,ksub(gamma121,gamma332),JacPDstandard4th1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro232 = 
+    CCTK_REAL_VEC Ro232 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma122,kmadd(kzzL,gamma322,kadd(JacPDstandard4th3kyy,knmsub(kxyL,gamma132,knmsub(kyyL,gamma232,kmsub(kyzL,ksub(gamma222,gamma332),JacPDstandard4th2kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro233 = ToReal(0);
+    CCTK_REAL_VEC Ro233 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro311 = ToReal(0);
+    CCTK_REAL_VEC Ro311 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro312 = 
+    CCTK_REAL_VEC Ro312 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxzL,gamma332,kadd(JacPDstandard4th1kyz,knmsub(kyyL,gamma231,knmsub(kyzL,gamma331,kmsub(kxyL,ksub(gamma232,gamma131),JacPDstandard4th2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro313 = 
+    CCTK_REAL_VEC Ro313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma133,kmadd(kxyL,gamma233,kadd(JacPDstandard4th1kzz,knmsub(kyzL,gamma231,knmsub(kzzL,gamma331,kmsub(kxzL,ksub(gamma333,gamma131),JacPDstandard4th3kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro321 = 
+    CCTK_REAL_VEC Ro321 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma231,kmadd(kyzL,gamma331,kadd(JacPDstandard4th2kxz,knmsub(kxxL,gamma132,knmsub(kxzL,gamma332,kmsub(kxyL,ksub(gamma131,gamma232),JacPDstandard4th1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro322 = ToReal(0);
+    CCTK_REAL_VEC Ro322 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro323 = 
+    CCTK_REAL_VEC Ro323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma133,kmadd(kyyL,gamma233,kadd(JacPDstandard4th2kzz,knmsub(kxzL,gamma132,knmsub(kzzL,gamma332,kmsub(kyzL,ksub(gamma333,gamma232),JacPDstandard4th3kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro331 = 
+    CCTK_REAL_VEC Ro331 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma231,kmadd(kzzL,gamma331,kadd(JacPDstandard4th3kxz,knmsub(kxxL,gamma133,knmsub(kxyL,gamma233,kmsub(kxzL,ksub(gamma131,gamma333),JacPDstandard4th1kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro332 = 
+    CCTK_REAL_VEC Ro332 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma132,kmadd(kzzL,gamma332,kadd(JacPDstandard4th3kyz,knmsub(kxyL,gamma133,knmsub(kyyL,gamma233,kmsub(kyzL,ksub(gamma232,gamma333),JacPDstandard4th2kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro333 = ToReal(0);
+    CCTK_REAL_VEC Ro333 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo11 = 
+    CCTK_REAL_VEC Rojo11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv23,gInv32),kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv22,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo12 = 
+    CCTK_REAL_VEC Rojo12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv23,R1223,knmsub(gInv21,R1212,knmsub(gInv31,R1213,kmadd(gInv12,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv32,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo13 = 
+    CCTK_REAL_VEC Rojo13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv23),kmadd(gInv13,kmul(kxzL,kxzL),knmsub(gInv21,R1213,knmsub(gInv31,R1313,knmsub(gInv32,R1323,kmadd(gInv12,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv23,kmul(kxxL,gInv13))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo21 = 
+    CCTK_REAL_VEC Rojo21 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv32,R1223,knmsub(gInv12,R1212,knmsub(gInv13,R1213,kmadd(gInv21,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv23,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo22 = 
+    CCTK_REAL_VEC Rojo22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv13,gInv31),kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmadd(gInv11,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo23 = 
+    CCTK_REAL_VEC Rojo23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv12,R1223,knmsub(gInv31,R1323,knmsub(gInv32,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv21,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv23,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo31 = 
+    CCTK_REAL_VEC Rojo31 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv32),kmadd(gInv31,kmul(kxzL,kxzL),knmsub(gInv12,R1213,knmsub(gInv13,R1313,knmsub(gInv23,R1323,kmadd(gInv21,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv32,kmul(kxxL,gInv31))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo32 = 
+    CCTK_REAL_VEC Rojo32 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv21,R1223,knmsub(gInv13,R1323,knmsub(gInv23,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv12,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv32,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo33 = 
+    CCTK_REAL_VEC Rojo33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv12,gInv21),kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)),kmadd(gInv11,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)),kmul(gInv22,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4rL = 
+    CCTK_REAL_VEC Psi4rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2)))))),kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),knmsub(kmul(nn,nn),kmadd(imbar1,kmadd(imbar2,kadd(Rojo12,Rojo21),kmul(imbar3,kadd(Rojo13,Rojo31))),knmsub(rmbar1,kmadd(rmbar2,kadd(Rojo12,Rojo21),kmul(rmbar3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo32,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo11,kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(Rojo22,kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),kmul(Rojo33,kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3))))))))),kmsub(kmadd(kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmsub(imbar1,imbar2,kmul(rmbar1,rmbar2)),kmadd(kmadd(n1,kmul(n2,R4p1213),kmadd(n1,kmul(n3,R4p1313),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2))))),kmsub(imbar1,imbar3,kmul(rmbar1,rmbar3)),kmadd(kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmul(nn,kmadd(kmadd(n1,Ro112,kmadd(n2,Ro122,kmul(n3,Ro132))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro211,kmadd(n2,Ro221,kmul(n3,Ro231))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro113,kmadd(n2,Ro123,kmul(n3,Ro133))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro311,kmadd(n2,Ro321,kmul(n3,Ro331))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro213,kmadd(n2,Ro223,kmul(n3,Ro233))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro312,kmadd(n2,Ro322,kmul(n3,Ro332))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131))),kmsub(rmbar1,rmbar1,kmul(imbar1,imbar1)),kmadd(kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232))),kmsub(rmbar2,rmbar2,kmul(imbar2,imbar2)),kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),kmsub(rmbar3,rmbar3,kmul(imbar3,imbar3))))))))))))))),ToReal(2),kmadd(kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3)),kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4iL = 
+    CCTK_REAL_VEC Psi4iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kmadd(n2,R4p1213,kmul(n3,R4p1313)),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2)))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmul(nn,kmadd(kmadd(im1,kmul(rm1,kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131)))),kmul(im2,kmul(rm2,kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232)))))),ToReal(-2),kmsub(im3,kmul(rm3,kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),ToReal(-2))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(n1,kadd(Ro211,Ro112),kmadd(n3,kadd(Ro231,Ro132),kmul(n2,kadd(Ro221,Ro122)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(n1,kadd(Ro312,Ro213),kmadd(n3,kadd(Ro332,Ro233),kmul(n2,kadd(Ro322,Ro223)))),kmul(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kadd(Ro311,Ro113),kmadd(n3,kadd(Ro331,Ro133),kmul(n2,kadd(Ro321,Ro123)))))))))))),ToReal(2),kmsub(ToReal(-2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2))))))),kmul(im3,kmul(rm3,kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_psi4_calc_Nth.cc b/src/WeylScal4_psi4_calc_Nth.cc
index 064308d..b0d6cc1 100644
--- a/src/WeylScal4_psi4_calc_Nth.cc
+++ b/src/WeylScal4_psi4_calc_Nth.cc
@@ -68,13 +68,18 @@ static void WeylScal4_psi4_calc_Nth_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -119,9 +124,9 @@ static void WeylScal4_psi4_calc_Nth_Body(const cGH* restrict const cctkGH, const
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -138,26 +143,6 @@ static void WeylScal4_psi4_calc_Nth_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -995,350 +980,350 @@ static void WeylScal4_psi4_calc_Nth_Body(const cGH* restrict const cctkGH, const
       JacPDstandard32gyz = PDstandard23gyz;
     }
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED detg = 
+    CCTK_REAL_VEC detg CCTK_ATTRIBUTE_UNUSED = 
       knmsub(gyyL,kmul(gxzL,gxzL),knmsub(gxxL,kmul(gyzL,gyzL),kmadd(gzzL,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)),kmul(gxyL,kmul(gxzL,kmul(gyzL,ToReal(2)))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED invdetg = kdiv(ToReal(1),detg);
+    CCTK_REAL_VEC invdetg CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(1),detg);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv11 = 
+    CCTK_REAL_VEC gInv11 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gyyL,gzzL,kmul(gyzL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv12 = 
+    CCTK_REAL_VEC gInv12 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv13 = 
+    CCTK_REAL_VEC gInv13 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv21 = 
+    CCTK_REAL_VEC gInv21 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv22 = 
+    CCTK_REAL_VEC gInv22 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gzzL,kmul(gxzL,gxzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv23 = 
+    CCTK_REAL_VEC gInv23 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv31 = 
+    CCTK_REAL_VEC gInv31 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv32 = 
+    CCTK_REAL_VEC gInv32 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv33 = 
+    CCTK_REAL_VEC gInv33 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma111 = 
+    CCTK_REAL_VEC gamma111 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv11,JacPDstandard1gxx,knmsub(gInv12,JacPDstandard2gxx,kmsub(kmadd(gInv12,JacPDstandard1gxy,kmul(gInv13,JacPDstandard1gxz)),ToReal(2),kmul(gInv13,JacPDstandard3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma211 = 
+    CCTK_REAL_VEC gamma211 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv21,JacPDstandard1gxx,knmsub(gInv22,JacPDstandard2gxx,kmsub(kmadd(gInv22,JacPDstandard1gxy,kmul(gInv23,JacPDstandard1gxz)),ToReal(2),kmul(gInv23,JacPDstandard3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma311 = 
+    CCTK_REAL_VEC gamma311 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv31,JacPDstandard1gxx,knmsub(gInv32,JacPDstandard2gxx,kmsub(kmadd(gInv32,JacPDstandard1gxy,kmul(gInv33,JacPDstandard1gxz)),ToReal(2),kmul(gInv33,JacPDstandard3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma121 = 
+    CCTK_REAL_VEC gamma121 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv12,JacPDstandard1gyy,kmadd(gInv11,JacPDstandard2gxx,kmul(gInv13,kadd(JacPDstandard1gyz,ksub(JacPDstandard2gxz,JacPDstandard3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma221 = 
+    CCTK_REAL_VEC gamma221 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv22,JacPDstandard1gyy,kmadd(gInv21,JacPDstandard2gxx,kmul(gInv23,kadd(JacPDstandard1gyz,ksub(JacPDstandard2gxz,JacPDstandard3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma321 = 
+    CCTK_REAL_VEC gamma321 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv32,JacPDstandard1gyy,kmadd(gInv31,JacPDstandard2gxx,kmul(gInv33,kadd(JacPDstandard1gyz,ksub(JacPDstandard2gxz,JacPDstandard3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma131 = 
+    CCTK_REAL_VEC gamma131 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard1gzz,kmadd(gInv11,JacPDstandard3gxx,kmul(gInv12,kadd(JacPDstandard1gyz,ksub(JacPDstandard3gxy,JacPDstandard2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma231 = 
+    CCTK_REAL_VEC gamma231 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard1gzz,kmadd(gInv21,JacPDstandard3gxx,kmul(gInv22,kadd(JacPDstandard1gyz,ksub(JacPDstandard3gxy,JacPDstandard2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma331 = 
+    CCTK_REAL_VEC gamma331 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard1gzz,kmadd(gInv31,JacPDstandard3gxx,kmul(gInv32,kadd(JacPDstandard1gyz,ksub(JacPDstandard3gxy,JacPDstandard2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma122 = 
+    CCTK_REAL_VEC gamma122 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv12,JacPDstandard2gyy,kmadd(gInv11,kmsub(JacPDstandard2gxy,ToReal(2),JacPDstandard1gyy),kmul(gInv13,kmsub(JacPDstandard2gyz,ToReal(2),JacPDstandard3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma222 = 
+    CCTK_REAL_VEC gamma222 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv22,JacPDstandard2gyy,kmadd(gInv21,kmsub(JacPDstandard2gxy,ToReal(2),JacPDstandard1gyy),kmul(gInv23,kmsub(JacPDstandard2gyz,ToReal(2),JacPDstandard3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma322 = 
+    CCTK_REAL_VEC gamma322 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv32,JacPDstandard2gyy,kmadd(gInv31,kmsub(JacPDstandard2gxy,ToReal(2),JacPDstandard1gyy),kmul(gInv33,kmsub(JacPDstandard2gyz,ToReal(2),JacPDstandard3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma132 = 
+    CCTK_REAL_VEC gamma132 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard2gzz,kmadd(gInv12,JacPDstandard3gyy,kmul(gInv11,kadd(JacPDstandard2gxz,ksub(JacPDstandard3gxy,JacPDstandard1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma232 = 
+    CCTK_REAL_VEC gamma232 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard2gzz,kmadd(gInv22,JacPDstandard3gyy,kmul(gInv21,kadd(JacPDstandard2gxz,ksub(JacPDstandard3gxy,JacPDstandard1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma332 = 
+    CCTK_REAL_VEC gamma332 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard2gzz,kmadd(gInv32,JacPDstandard3gyy,kmul(gInv31,kadd(JacPDstandard2gxz,ksub(JacPDstandard3gxy,JacPDstandard1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma133 = 
+    CCTK_REAL_VEC gamma133 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv13,JacPDstandard3gzz,kmadd(gInv11,kmsub(JacPDstandard3gxz,ToReal(2),JacPDstandard1gzz),kmul(gInv12,kmsub(JacPDstandard3gyz,ToReal(2),JacPDstandard2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma233 = 
+    CCTK_REAL_VEC gamma233 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv23,JacPDstandard3gzz,kmadd(gInv21,kmsub(JacPDstandard3gxz,ToReal(2),JacPDstandard1gzz),kmul(gInv22,kmsub(JacPDstandard3gyz,ToReal(2),JacPDstandard2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma333 = 
+    CCTK_REAL_VEC gamma333 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv33,JacPDstandard3gzz,kmadd(gInv31,kmsub(JacPDstandard3gxz,ToReal(2),JacPDstandard1gzz),kmul(gInv32,kmsub(JacPDstandard3gyz,ToReal(2),JacPDstandard2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED xmoved = ksub(xL,ToReal(xorig));
+    CCTK_REAL_VEC xmoved CCTK_ATTRIBUTE_UNUSED = ksub(xL,ToReal(xorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ymoved = ksub(yL,ToReal(yorig));
+    CCTK_REAL_VEC ymoved CCTK_ATTRIBUTE_UNUSED = ksub(yL,ToReal(yorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED zmoved = ksub(zL,ToReal(zorig));
+    CCTK_REAL_VEC zmoved CCTK_ATTRIBUTE_UNUSED = ksub(zL,ToReal(zorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va1 = kneg(ymoved);
+    CCTK_REAL_VEC va1 CCTK_ATTRIBUTE_UNUSED = kneg(ymoved);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va2 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC va2 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va3 = ToReal(0);
+    CCTK_REAL_VEC va3 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb1 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC vb1 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb2 = ymoved;
+    CCTK_REAL_VEC vb2 CCTK_ATTRIBUTE_UNUSED = ymoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb3 = zmoved;
+    CCTK_REAL_VEC vb3 CCTK_ATTRIBUTE_UNUSED = zmoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc1 = 
+    CCTK_REAL_VEC vc1 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv11,va2,kmul(gInv12,va1)),kmadd(vb1,kmsub(gInv12,va3,kmul(gInv13,va2)),kmul(vb2,kmsub(gInv13,va1,kmul(gInv11,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc2 = 
+    CCTK_REAL_VEC vc2 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv21,va2,kmul(gInv22,va1)),kmadd(vb1,kmsub(gInv22,va3,kmul(gInv23,va2)),kmul(vb2,kmsub(gInv23,va1,kmul(gInv21,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc3 = 
+    CCTK_REAL_VEC vc3 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv31,va2,kmul(gInv32,va1)),kmadd(vb1,kmsub(gInv32,va3,kmul(gInv33,va2)),kmul(vb2,kmsub(gInv33,va1,kmul(gInv31,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa1 = va1;
+    CCTK_REAL_VEC wa1 CCTK_ATTRIBUTE_UNUSED = va1;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa2 = va2;
+    CCTK_REAL_VEC wa2 CCTK_ATTRIBUTE_UNUSED = va2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa3 = va3;
+    CCTK_REAL_VEC wa3 CCTK_ATTRIBUTE_UNUSED = va3;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega11 = 
+    CCTK_REAL_VEC omega11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wa1,wa1),kmadd(gyyL,kmul(wa2,wa2),kmadd(gzzL,kmul(wa3,wa3),kmul(kmadd(gyzL,kmul(wa2,wa3),kmul(wa1,kmadd(gxyL,wa2,kmul(gxzL,wa3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea1 = kdiv(wa1,ksqrt(omega11));
+    CCTK_REAL_VEC ea1 CCTK_ATTRIBUTE_UNUSED = kdiv(wa1,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea2 = kdiv(wa2,ksqrt(omega11));
+    CCTK_REAL_VEC ea2 CCTK_ATTRIBUTE_UNUSED = kdiv(wa2,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea3 = kdiv(wa3,ksqrt(omega11));
+    CCTK_REAL_VEC ea3 CCTK_ATTRIBUTE_UNUSED = kdiv(wa3,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega12 = 
+    CCTK_REAL_VEC omega12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vb1,kmadd(gxyL,vb2,kmul(gxzL,vb3))),kmadd(ea2,kmadd(gxyL,vb1,kmadd(gyyL,vb2,kmul(gyzL,vb3))),kmul(ea3,kmadd(gxzL,vb1,kmadd(gyzL,vb2,kmul(gzzL,vb3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb1 = knmsub(ea1,omega12,vb1);
+    CCTK_REAL_VEC wb1 CCTK_ATTRIBUTE_UNUSED = knmsub(ea1,omega12,vb1);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb2 = knmsub(ea2,omega12,vb2);
+    CCTK_REAL_VEC wb2 CCTK_ATTRIBUTE_UNUSED = knmsub(ea2,omega12,vb2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb3 = knmsub(ea3,omega12,vb3);
+    CCTK_REAL_VEC wb3 CCTK_ATTRIBUTE_UNUSED = knmsub(ea3,omega12,vb3);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega22 = 
+    CCTK_REAL_VEC omega22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wb1,wb1),kmadd(gyyL,kmul(wb2,wb2),kmadd(gzzL,kmul(wb3,wb3),kmul(kmadd(gyzL,kmul(wb2,wb3),kmul(wb1,kmadd(gxyL,wb2,kmul(gxzL,wb3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb1 = kdiv(wb1,ksqrt(omega22));
+    CCTK_REAL_VEC eb1 CCTK_ATTRIBUTE_UNUSED = kdiv(wb1,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb2 = kdiv(wb2,ksqrt(omega22));
+    CCTK_REAL_VEC eb2 CCTK_ATTRIBUTE_UNUSED = kdiv(wb2,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb3 = kdiv(wb3,ksqrt(omega22));
+    CCTK_REAL_VEC eb3 CCTK_ATTRIBUTE_UNUSED = kdiv(wb3,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega13 = 
+    CCTK_REAL_VEC omega13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(ea2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(ea3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega23 = 
+    CCTK_REAL_VEC omega23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(eb1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(eb2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(eb3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc1 = 
+    CCTK_REAL_VEC wc1 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc1,kmadd(eb1,omega23,kmul(ea1,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc2 = 
+    CCTK_REAL_VEC wc2 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc2,kmadd(eb2,omega23,kmul(ea2,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc3 = 
+    CCTK_REAL_VEC wc3 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc3,kmadd(eb3,omega23,kmul(ea3,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega33 = 
+    CCTK_REAL_VEC omega33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wc1,wc1),kmadd(gyyL,kmul(wc2,wc2),kmadd(gzzL,kmul(wc3,wc3),kmul(kmadd(gyzL,kmul(wc2,wc3),kmul(wc1,kmadd(gxyL,wc2,kmul(gxzL,wc3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec1 = kdiv(wc1,ksqrt(omega33));
+    CCTK_REAL_VEC ec1 CCTK_ATTRIBUTE_UNUSED = kdiv(wc1,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec2 = kdiv(wc2,ksqrt(omega33));
+    CCTK_REAL_VEC ec2 CCTK_ATTRIBUTE_UNUSED = kdiv(wc2,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec3 = kdiv(wc3,ksqrt(omega33));
+    CCTK_REAL_VEC ec3 CCTK_ATTRIBUTE_UNUSED = kdiv(wc3,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED isqrt2 = 
+    CCTK_REAL_VEC isqrt2 CCTK_ATTRIBUTE_UNUSED = 
       ToReal(0.707106781186547524);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n1 = kneg(kmul(eb1,isqrt2));
+    CCTK_REAL_VEC n1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n2 = kneg(kmul(eb2,isqrt2));
+    CCTK_REAL_VEC n2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n3 = kneg(kmul(eb3,isqrt2));
+    CCTK_REAL_VEC n3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rm1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rm2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rm3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im1 = kmul(ea1,isqrt2);
+    CCTK_REAL_VEC im1 CCTK_ATTRIBUTE_UNUSED = kmul(ea1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im2 = kmul(ea2,isqrt2);
+    CCTK_REAL_VEC im2 CCTK_ATTRIBUTE_UNUSED = kmul(ea2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im3 = kmul(ea3,isqrt2);
+    CCTK_REAL_VEC im3 CCTK_ATTRIBUTE_UNUSED = kmul(ea3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rmbar1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rmbar2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rmbar3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar1 = kneg(kmul(ea1,isqrt2));
+    CCTK_REAL_VEC imbar1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar2 = kneg(kmul(ea2,isqrt2));
+    CCTK_REAL_VEC imbar2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar3 = kneg(kmul(ea3,isqrt2));
+    CCTK_REAL_VEC imbar3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED nn = isqrt2;
+    CCTK_REAL_VEC nn CCTK_ATTRIBUTE_UNUSED = isqrt2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1212 = 
+    CCTK_REAL_VEC R1212 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard12gxy,kadd(JacPDstandard21gxy,kmadd(kmadd(gamma122,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma222,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma322))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma221,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(gamma321,kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321)))))),ToReal(2),JacPDstandard22gxx),JacPDstandard11gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1213 = 
+    CCTK_REAL_VEC R1213 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard12gxz,kadd(JacPDstandard31gxy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma232,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma221,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma321,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard23gxx),JacPDstandard11gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1223 = 
+    CCTK_REAL_VEC R1223 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard22gxz,kadd(JacPDstandard31gyy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma232,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma122,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma222,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma322,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard23gxy),JacPDstandard12gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1313 = 
+    CCTK_REAL_VEC R1313 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard13gxz,kadd(JacPDstandard31gxz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma233,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma131,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma231,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma331,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard33gxx),JacPDstandard11gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1323 = 
+    CCTK_REAL_VEC R1323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard23gxz,kadd(JacPDstandard31gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma233,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma232,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331))),gamma332))),ToReal(2),JacPDstandard33gxy),JacPDstandard12gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R2323 = 
+    CCTK_REAL_VEC R2323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard23gyz,kadd(JacPDstandard32gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma122,kmadd(gxyL,gamma222,kmul(gxzL,gamma322))),kmadd(gamma233,kmadd(gxyL,gamma122,kmadd(gyyL,gamma222,kmul(gyzL,gamma322))),kmul(kmadd(gxzL,gamma122,kmadd(gyzL,gamma222,kmul(gzzL,gamma322))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma132,kmadd(gxyL,gamma232,kmul(gxzL,gamma332))),kmadd(gamma232,kmadd(gxyL,gamma132,kmadd(gyyL,gamma232,kmul(gyzL,gamma332))),kmul(gamma332,kmadd(gxzL,gamma132,kmadd(gyzL,gamma232,kmul(gzzL,gamma332)))))),ToReal(2),JacPDstandard33gyy),JacPDstandard22gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1212 = 
+    CCTK_REAL_VEC R4p1212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1213 = 
+    CCTK_REAL_VEC R4p1213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1223 = 
+    CCTK_REAL_VEC R4p1223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kyzL,knmsub(kxzL,kyyL,R1223));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1313 = 
+    CCTK_REAL_VEC R4p1313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1323 = 
+    CCTK_REAL_VEC R4p1323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p2323 = 
+    CCTK_REAL_VEC R4p2323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro111 = ToReal(0);
+    CCTK_REAL_VEC Ro111 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro112 = 
+    CCTK_REAL_VEC Ro112 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma121,kmadd(kxzL,gamma321,kadd(JacPDstandard1kxy,knmsub(kyyL,gamma211,knmsub(kyzL,gamma311,kmsub(kxyL,ksub(gamma221,gamma111),JacPDstandard2kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro113 = 
+    CCTK_REAL_VEC Ro113 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma131,kmadd(kxyL,gamma231,kadd(JacPDstandard1kxz,knmsub(kyzL,gamma211,knmsub(kzzL,gamma311,kmsub(kxzL,ksub(gamma331,gamma111),JacPDstandard3kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro121 = 
+    CCTK_REAL_VEC Ro121 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma211,kmadd(kyzL,gamma311,kadd(JacPDstandard2kxx,knmsub(kxxL,gamma121,knmsub(kxzL,gamma321,kmsub(kxyL,ksub(gamma111,gamma221),JacPDstandard1kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro122 = ToReal(0);
+    CCTK_REAL_VEC Ro122 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro123 = 
+    CCTK_REAL_VEC Ro123 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma131,kmadd(kyyL,gamma231,kadd(JacPDstandard2kxz,knmsub(kxzL,gamma121,knmsub(kzzL,gamma321,kmsub(kyzL,ksub(gamma331,gamma221),JacPDstandard3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro131 = 
+    CCTK_REAL_VEC Ro131 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma211,kmadd(kzzL,gamma311,kadd(JacPDstandard3kxx,knmsub(kxxL,gamma131,knmsub(kxyL,gamma231,kmsub(kxzL,ksub(gamma111,gamma331),JacPDstandard1kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro132 = 
+    CCTK_REAL_VEC Ro132 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma121,kmadd(kzzL,gamma321,kadd(JacPDstandard3kxy,knmsub(kxyL,gamma131,knmsub(kyyL,gamma231,kmsub(kyzL,ksub(gamma221,gamma331),JacPDstandard2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro133 = ToReal(0);
+    CCTK_REAL_VEC Ro133 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro211 = ToReal(0);
+    CCTK_REAL_VEC Ro211 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro212 = 
+    CCTK_REAL_VEC Ro212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma122,kmadd(kxzL,gamma322,kadd(JacPDstandard1kyy,knmsub(kyyL,gamma221,knmsub(kyzL,gamma321,kmsub(kxyL,ksub(gamma222,gamma121),JacPDstandard2kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro213 = 
+    CCTK_REAL_VEC Ro213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxyL,gamma232,kadd(JacPDstandard1kyz,knmsub(kyzL,gamma221,knmsub(kzzL,gamma321,kmsub(kxzL,ksub(gamma332,gamma121),JacPDstandard3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro221 = 
+    CCTK_REAL_VEC Ro221 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma221,kmadd(kyzL,gamma321,kadd(JacPDstandard2kxy,knmsub(kxxL,gamma122,knmsub(kxzL,gamma322,kmsub(kxyL,ksub(gamma121,gamma222),JacPDstandard1kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro222 = ToReal(0);
+    CCTK_REAL_VEC Ro222 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro223 = 
+    CCTK_REAL_VEC Ro223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma132,kmadd(kyyL,gamma232,kadd(JacPDstandard2kyz,knmsub(kxzL,gamma122,knmsub(kzzL,gamma322,kmsub(kyzL,ksub(gamma332,gamma222),JacPDstandard3kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro231 = 
+    CCTK_REAL_VEC Ro231 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma221,kmadd(kzzL,gamma321,kadd(JacPDstandard3kxy,knmsub(kxxL,gamma132,knmsub(kxyL,gamma232,kmsub(kxzL,ksub(gamma121,gamma332),JacPDstandard1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro232 = 
+    CCTK_REAL_VEC Ro232 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma122,kmadd(kzzL,gamma322,kadd(JacPDstandard3kyy,knmsub(kxyL,gamma132,knmsub(kyyL,gamma232,kmsub(kyzL,ksub(gamma222,gamma332),JacPDstandard2kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro233 = ToReal(0);
+    CCTK_REAL_VEC Ro233 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro311 = ToReal(0);
+    CCTK_REAL_VEC Ro311 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro312 = 
+    CCTK_REAL_VEC Ro312 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxzL,gamma332,kadd(JacPDstandard1kyz,knmsub(kyyL,gamma231,knmsub(kyzL,gamma331,kmsub(kxyL,ksub(gamma232,gamma131),JacPDstandard2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro313 = 
+    CCTK_REAL_VEC Ro313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma133,kmadd(kxyL,gamma233,kadd(JacPDstandard1kzz,knmsub(kyzL,gamma231,knmsub(kzzL,gamma331,kmsub(kxzL,ksub(gamma333,gamma131),JacPDstandard3kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro321 = 
+    CCTK_REAL_VEC Ro321 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma231,kmadd(kyzL,gamma331,kadd(JacPDstandard2kxz,knmsub(kxxL,gamma132,knmsub(kxzL,gamma332,kmsub(kxyL,ksub(gamma131,gamma232),JacPDstandard1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro322 = ToReal(0);
+    CCTK_REAL_VEC Ro322 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro323 = 
+    CCTK_REAL_VEC Ro323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma133,kmadd(kyyL,gamma233,kadd(JacPDstandard2kzz,knmsub(kxzL,gamma132,knmsub(kzzL,gamma332,kmsub(kyzL,ksub(gamma333,gamma232),JacPDstandard3kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro331 = 
+    CCTK_REAL_VEC Ro331 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma231,kmadd(kzzL,gamma331,kadd(JacPDstandard3kxz,knmsub(kxxL,gamma133,knmsub(kxyL,gamma233,kmsub(kxzL,ksub(gamma131,gamma333),JacPDstandard1kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro332 = 
+    CCTK_REAL_VEC Ro332 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma132,kmadd(kzzL,gamma332,kadd(JacPDstandard3kyz,knmsub(kxyL,gamma133,knmsub(kyyL,gamma233,kmsub(kyzL,ksub(gamma232,gamma333),JacPDstandard2kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro333 = ToReal(0);
+    CCTK_REAL_VEC Ro333 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo11 = 
+    CCTK_REAL_VEC Rojo11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv23,gInv32),kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv22,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo12 = 
+    CCTK_REAL_VEC Rojo12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv23,R1223,knmsub(gInv21,R1212,knmsub(gInv31,R1213,kmadd(gInv12,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv32,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo13 = 
+    CCTK_REAL_VEC Rojo13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv23),kmadd(gInv13,kmul(kxzL,kxzL),knmsub(gInv21,R1213,knmsub(gInv31,R1313,knmsub(gInv32,R1323,kmadd(gInv12,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv23,kmul(kxxL,gInv13))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo21 = 
+    CCTK_REAL_VEC Rojo21 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv32,R1223,knmsub(gInv12,R1212,knmsub(gInv13,R1213,kmadd(gInv21,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv23,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo22 = 
+    CCTK_REAL_VEC Rojo22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv13,gInv31),kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmadd(gInv11,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo23 = 
+    CCTK_REAL_VEC Rojo23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv12,R1223,knmsub(gInv31,R1323,knmsub(gInv32,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv21,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv23,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo31 = 
+    CCTK_REAL_VEC Rojo31 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv32),kmadd(gInv31,kmul(kxzL,kxzL),knmsub(gInv12,R1213,knmsub(gInv13,R1313,knmsub(gInv23,R1323,kmadd(gInv21,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv32,kmul(kxxL,gInv31))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo32 = 
+    CCTK_REAL_VEC Rojo32 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv21,R1223,knmsub(gInv13,R1323,knmsub(gInv23,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv12,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv32,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo33 = 
+    CCTK_REAL_VEC Rojo33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv12,gInv21),kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)),kmadd(gInv11,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)),kmul(gInv22,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4rL = 
+    CCTK_REAL_VEC Psi4rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2)))))),kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),knmsub(kmul(nn,nn),kmadd(imbar1,kmadd(imbar2,kadd(Rojo12,Rojo21),kmul(imbar3,kadd(Rojo13,Rojo31))),knmsub(rmbar1,kmadd(rmbar2,kadd(Rojo12,Rojo21),kmul(rmbar3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo32,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo11,kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(Rojo22,kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),kmul(Rojo33,kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3))))))))),kmsub(kmadd(kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmsub(imbar1,imbar2,kmul(rmbar1,rmbar2)),kmadd(kmadd(n1,kmul(n2,R4p1213),kmadd(n1,kmul(n3,R4p1313),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2))))),kmsub(imbar1,imbar3,kmul(rmbar1,rmbar3)),kmadd(kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmul(nn,kmadd(kmadd(n1,Ro112,kmadd(n2,Ro122,kmul(n3,Ro132))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro211,kmadd(n2,Ro221,kmul(n3,Ro231))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro113,kmadd(n2,Ro123,kmul(n3,Ro133))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro311,kmadd(n2,Ro321,kmul(n3,Ro331))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro213,kmadd(n2,Ro223,kmul(n3,Ro233))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro312,kmadd(n2,Ro322,kmul(n3,Ro332))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131))),kmsub(rmbar1,rmbar1,kmul(imbar1,imbar1)),kmadd(kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232))),kmsub(rmbar2,rmbar2,kmul(imbar2,imbar2)),kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),kmsub(rmbar3,rmbar3,kmul(imbar3,imbar3))))))))))))))),ToReal(2),kmadd(kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3)),kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4iL = 
+    CCTK_REAL_VEC Psi4iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kmadd(n2,R4p1213,kmul(n3,R4p1313)),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2)))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmul(nn,kmadd(kmadd(im1,kmul(rm1,kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131)))),kmul(im2,kmul(rm2,kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232)))))),ToReal(-2),kmsub(im3,kmul(rm3,kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),ToReal(-2))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(n1,kadd(Ro211,Ro112),kmadd(n3,kadd(Ro231,Ro132),kmul(n2,kadd(Ro221,Ro122)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(n1,kadd(Ro312,Ro213),kmadd(n3,kadd(Ro332,Ro233),kmul(n2,kadd(Ro322,Ro223)))),kmul(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kadd(Ro311,Ro113),kmadd(n3,kadd(Ro331,Ro133),kmul(n2,kadd(Ro321,Ro123)))))))))))),ToReal(2),kmsub(ToReal(-2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2))))))),kmul(im3,kmul(rm3,kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_psis_calc_2nd.cc b/src/WeylScal4_psis_calc_2nd.cc
index 47f2411..75130b2 100644
--- a/src/WeylScal4_psis_calc_2nd.cc
+++ b/src/WeylScal4_psis_calc_2nd.cc
@@ -92,13 +92,18 @@ static void WeylScal4_psis_calc_2nd_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -143,9 +148,9 @@ static void WeylScal4_psis_calc_2nd_Body(const cGH* restrict const cctkGH, const
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -162,26 +167,6 @@ static void WeylScal4_psis_calc_2nd_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -1019,380 +1004,380 @@ static void WeylScal4_psis_calc_2nd_Body(const cGH* restrict const cctkGH, const
       JacPDstandard2nd32gyz = PDstandard2nd23gyz;
     }
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED detg = 
+    CCTK_REAL_VEC detg CCTK_ATTRIBUTE_UNUSED = 
       knmsub(gyyL,kmul(gxzL,gxzL),knmsub(gxxL,kmul(gyzL,gyzL),kmadd(gzzL,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)),kmul(gxyL,kmul(gxzL,kmul(gyzL,ToReal(2)))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED invdetg = kdiv(ToReal(1),detg);
+    CCTK_REAL_VEC invdetg CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(1),detg);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv11 = 
+    CCTK_REAL_VEC gInv11 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gyyL,gzzL,kmul(gyzL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv12 = 
+    CCTK_REAL_VEC gInv12 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv13 = 
+    CCTK_REAL_VEC gInv13 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv21 = 
+    CCTK_REAL_VEC gInv21 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv22 = 
+    CCTK_REAL_VEC gInv22 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gzzL,kmul(gxzL,gxzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv23 = 
+    CCTK_REAL_VEC gInv23 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv31 = 
+    CCTK_REAL_VEC gInv31 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv32 = 
+    CCTK_REAL_VEC gInv32 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv33 = 
+    CCTK_REAL_VEC gInv33 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma111 = 
+    CCTK_REAL_VEC gamma111 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv11,JacPDstandard2nd1gxx,knmsub(gInv12,JacPDstandard2nd2gxx,kmsub(kmadd(gInv12,JacPDstandard2nd1gxy,kmul(gInv13,JacPDstandard2nd1gxz)),ToReal(2),kmul(gInv13,JacPDstandard2nd3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma211 = 
+    CCTK_REAL_VEC gamma211 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv21,JacPDstandard2nd1gxx,knmsub(gInv22,JacPDstandard2nd2gxx,kmsub(kmadd(gInv22,JacPDstandard2nd1gxy,kmul(gInv23,JacPDstandard2nd1gxz)),ToReal(2),kmul(gInv23,JacPDstandard2nd3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma311 = 
+    CCTK_REAL_VEC gamma311 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv31,JacPDstandard2nd1gxx,knmsub(gInv32,JacPDstandard2nd2gxx,kmsub(kmadd(gInv32,JacPDstandard2nd1gxy,kmul(gInv33,JacPDstandard2nd1gxz)),ToReal(2),kmul(gInv33,JacPDstandard2nd3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma121 = 
+    CCTK_REAL_VEC gamma121 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv12,JacPDstandard2nd1gyy,kmadd(gInv11,JacPDstandard2nd2gxx,kmul(gInv13,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd2gxz,JacPDstandard2nd3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma221 = 
+    CCTK_REAL_VEC gamma221 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv22,JacPDstandard2nd1gyy,kmadd(gInv21,JacPDstandard2nd2gxx,kmul(gInv23,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd2gxz,JacPDstandard2nd3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma321 = 
+    CCTK_REAL_VEC gamma321 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv32,JacPDstandard2nd1gyy,kmadd(gInv31,JacPDstandard2nd2gxx,kmul(gInv33,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd2gxz,JacPDstandard2nd3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma131 = 
+    CCTK_REAL_VEC gamma131 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard2nd1gzz,kmadd(gInv11,JacPDstandard2nd3gxx,kmul(gInv12,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma231 = 
+    CCTK_REAL_VEC gamma231 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard2nd1gzz,kmadd(gInv21,JacPDstandard2nd3gxx,kmul(gInv22,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma331 = 
+    CCTK_REAL_VEC gamma331 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard2nd1gzz,kmadd(gInv31,JacPDstandard2nd3gxx,kmul(gInv32,kadd(JacPDstandard2nd1gyz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma122 = 
+    CCTK_REAL_VEC gamma122 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv12,JacPDstandard2nd2gyy,kmadd(gInv11,kmsub(JacPDstandard2nd2gxy,ToReal(2),JacPDstandard2nd1gyy),kmul(gInv13,kmsub(JacPDstandard2nd2gyz,ToReal(2),JacPDstandard2nd3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma222 = 
+    CCTK_REAL_VEC gamma222 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv22,JacPDstandard2nd2gyy,kmadd(gInv21,kmsub(JacPDstandard2nd2gxy,ToReal(2),JacPDstandard2nd1gyy),kmul(gInv23,kmsub(JacPDstandard2nd2gyz,ToReal(2),JacPDstandard2nd3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma322 = 
+    CCTK_REAL_VEC gamma322 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv32,JacPDstandard2nd2gyy,kmadd(gInv31,kmsub(JacPDstandard2nd2gxy,ToReal(2),JacPDstandard2nd1gyy),kmul(gInv33,kmsub(JacPDstandard2nd2gyz,ToReal(2),JacPDstandard2nd3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma132 = 
+    CCTK_REAL_VEC gamma132 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard2nd2gzz,kmadd(gInv12,JacPDstandard2nd3gyy,kmul(gInv11,kadd(JacPDstandard2nd2gxz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma232 = 
+    CCTK_REAL_VEC gamma232 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard2nd2gzz,kmadd(gInv22,JacPDstandard2nd3gyy,kmul(gInv21,kadd(JacPDstandard2nd2gxz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma332 = 
+    CCTK_REAL_VEC gamma332 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard2nd2gzz,kmadd(gInv32,JacPDstandard2nd3gyy,kmul(gInv31,kadd(JacPDstandard2nd2gxz,ksub(JacPDstandard2nd3gxy,JacPDstandard2nd1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma133 = 
+    CCTK_REAL_VEC gamma133 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv13,JacPDstandard2nd3gzz,kmadd(gInv11,kmsub(JacPDstandard2nd3gxz,ToReal(2),JacPDstandard2nd1gzz),kmul(gInv12,kmsub(JacPDstandard2nd3gyz,ToReal(2),JacPDstandard2nd2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma233 = 
+    CCTK_REAL_VEC gamma233 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv23,JacPDstandard2nd3gzz,kmadd(gInv21,kmsub(JacPDstandard2nd3gxz,ToReal(2),JacPDstandard2nd1gzz),kmul(gInv22,kmsub(JacPDstandard2nd3gyz,ToReal(2),JacPDstandard2nd2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma333 = 
+    CCTK_REAL_VEC gamma333 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv33,JacPDstandard2nd3gzz,kmadd(gInv31,kmsub(JacPDstandard2nd3gxz,ToReal(2),JacPDstandard2nd1gzz),kmul(gInv32,kmsub(JacPDstandard2nd3gyz,ToReal(2),JacPDstandard2nd2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED xmoved = ksub(xL,ToReal(xorig));
+    CCTK_REAL_VEC xmoved CCTK_ATTRIBUTE_UNUSED = ksub(xL,ToReal(xorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ymoved = ksub(yL,ToReal(yorig));
+    CCTK_REAL_VEC ymoved CCTK_ATTRIBUTE_UNUSED = ksub(yL,ToReal(yorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED zmoved = ksub(zL,ToReal(zorig));
+    CCTK_REAL_VEC zmoved CCTK_ATTRIBUTE_UNUSED = ksub(zL,ToReal(zorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va1 = kneg(ymoved);
+    CCTK_REAL_VEC va1 CCTK_ATTRIBUTE_UNUSED = kneg(ymoved);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va2 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC va2 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va3 = ToReal(0);
+    CCTK_REAL_VEC va3 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb1 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC vb1 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb2 = ymoved;
+    CCTK_REAL_VEC vb2 CCTK_ATTRIBUTE_UNUSED = ymoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb3 = zmoved;
+    CCTK_REAL_VEC vb3 CCTK_ATTRIBUTE_UNUSED = zmoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc1 = 
+    CCTK_REAL_VEC vc1 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv11,va2,kmul(gInv12,va1)),kmadd(vb1,kmsub(gInv12,va3,kmul(gInv13,va2)),kmul(vb2,kmsub(gInv13,va1,kmul(gInv11,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc2 = 
+    CCTK_REAL_VEC vc2 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv21,va2,kmul(gInv22,va1)),kmadd(vb1,kmsub(gInv22,va3,kmul(gInv23,va2)),kmul(vb2,kmsub(gInv23,va1,kmul(gInv21,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc3 = 
+    CCTK_REAL_VEC vc3 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv31,va2,kmul(gInv32,va1)),kmadd(vb1,kmsub(gInv32,va3,kmul(gInv33,va2)),kmul(vb2,kmsub(gInv33,va1,kmul(gInv31,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa1 = va1;
+    CCTK_REAL_VEC wa1 CCTK_ATTRIBUTE_UNUSED = va1;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa2 = va2;
+    CCTK_REAL_VEC wa2 CCTK_ATTRIBUTE_UNUSED = va2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa3 = va3;
+    CCTK_REAL_VEC wa3 CCTK_ATTRIBUTE_UNUSED = va3;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega11 = 
+    CCTK_REAL_VEC omega11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wa1,wa1),kmadd(gyyL,kmul(wa2,wa2),kmadd(gzzL,kmul(wa3,wa3),kmul(kmadd(gyzL,kmul(wa2,wa3),kmul(wa1,kmadd(gxyL,wa2,kmul(gxzL,wa3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea1 = kdiv(wa1,ksqrt(omega11));
+    CCTK_REAL_VEC ea1 CCTK_ATTRIBUTE_UNUSED = kdiv(wa1,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea2 = kdiv(wa2,ksqrt(omega11));
+    CCTK_REAL_VEC ea2 CCTK_ATTRIBUTE_UNUSED = kdiv(wa2,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea3 = kdiv(wa3,ksqrt(omega11));
+    CCTK_REAL_VEC ea3 CCTK_ATTRIBUTE_UNUSED = kdiv(wa3,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega12 = 
+    CCTK_REAL_VEC omega12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vb1,kmadd(gxyL,vb2,kmul(gxzL,vb3))),kmadd(ea2,kmadd(gxyL,vb1,kmadd(gyyL,vb2,kmul(gyzL,vb3))),kmul(ea3,kmadd(gxzL,vb1,kmadd(gyzL,vb2,kmul(gzzL,vb3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb1 = knmsub(ea1,omega12,vb1);
+    CCTK_REAL_VEC wb1 CCTK_ATTRIBUTE_UNUSED = knmsub(ea1,omega12,vb1);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb2 = knmsub(ea2,omega12,vb2);
+    CCTK_REAL_VEC wb2 CCTK_ATTRIBUTE_UNUSED = knmsub(ea2,omega12,vb2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb3 = knmsub(ea3,omega12,vb3);
+    CCTK_REAL_VEC wb3 CCTK_ATTRIBUTE_UNUSED = knmsub(ea3,omega12,vb3);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega22 = 
+    CCTK_REAL_VEC omega22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wb1,wb1),kmadd(gyyL,kmul(wb2,wb2),kmadd(gzzL,kmul(wb3,wb3),kmul(kmadd(gyzL,kmul(wb2,wb3),kmul(wb1,kmadd(gxyL,wb2,kmul(gxzL,wb3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb1 = kdiv(wb1,ksqrt(omega22));
+    CCTK_REAL_VEC eb1 CCTK_ATTRIBUTE_UNUSED = kdiv(wb1,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb2 = kdiv(wb2,ksqrt(omega22));
+    CCTK_REAL_VEC eb2 CCTK_ATTRIBUTE_UNUSED = kdiv(wb2,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb3 = kdiv(wb3,ksqrt(omega22));
+    CCTK_REAL_VEC eb3 CCTK_ATTRIBUTE_UNUSED = kdiv(wb3,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega13 = 
+    CCTK_REAL_VEC omega13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(ea2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(ea3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega23 = 
+    CCTK_REAL_VEC omega23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(eb1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(eb2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(eb3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc1 = 
+    CCTK_REAL_VEC wc1 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc1,kmadd(eb1,omega23,kmul(ea1,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc2 = 
+    CCTK_REAL_VEC wc2 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc2,kmadd(eb2,omega23,kmul(ea2,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc3 = 
+    CCTK_REAL_VEC wc3 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc3,kmadd(eb3,omega23,kmul(ea3,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega33 = 
+    CCTK_REAL_VEC omega33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wc1,wc1),kmadd(gyyL,kmul(wc2,wc2),kmadd(gzzL,kmul(wc3,wc3),kmul(kmadd(gyzL,kmul(wc2,wc3),kmul(wc1,kmadd(gxyL,wc2,kmul(gxzL,wc3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec1 = kdiv(wc1,ksqrt(omega33));
+    CCTK_REAL_VEC ec1 CCTK_ATTRIBUTE_UNUSED = kdiv(wc1,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec2 = kdiv(wc2,ksqrt(omega33));
+    CCTK_REAL_VEC ec2 CCTK_ATTRIBUTE_UNUSED = kdiv(wc2,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec3 = kdiv(wc3,ksqrt(omega33));
+    CCTK_REAL_VEC ec3 CCTK_ATTRIBUTE_UNUSED = kdiv(wc3,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED isqrt2 = 
+    CCTK_REAL_VEC isqrt2 CCTK_ATTRIBUTE_UNUSED = 
       ToReal(0.707106781186547524);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet1 = kmul(eb1,isqrt2);
+    CCTK_REAL_VEC ltet1 CCTK_ATTRIBUTE_UNUSED = kmul(eb1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet2 = kmul(eb2,isqrt2);
+    CCTK_REAL_VEC ltet2 CCTK_ATTRIBUTE_UNUSED = kmul(eb2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet3 = kmul(eb3,isqrt2);
+    CCTK_REAL_VEC ltet3 CCTK_ATTRIBUTE_UNUSED = kmul(eb3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n1 = kneg(kmul(eb1,isqrt2));
+    CCTK_REAL_VEC n1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n2 = kneg(kmul(eb2,isqrt2));
+    CCTK_REAL_VEC n2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n3 = kneg(kmul(eb3,isqrt2));
+    CCTK_REAL_VEC n3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rm1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rm2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rm3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im1 = kmul(ea1,isqrt2);
+    CCTK_REAL_VEC im1 CCTK_ATTRIBUTE_UNUSED = kmul(ea1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im2 = kmul(ea2,isqrt2);
+    CCTK_REAL_VEC im2 CCTK_ATTRIBUTE_UNUSED = kmul(ea2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im3 = kmul(ea3,isqrt2);
+    CCTK_REAL_VEC im3 CCTK_ATTRIBUTE_UNUSED = kmul(ea3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rmbar1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rmbar2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rmbar3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar1 = kneg(kmul(ea1,isqrt2));
+    CCTK_REAL_VEC imbar1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar2 = kneg(kmul(ea2,isqrt2));
+    CCTK_REAL_VEC imbar2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar3 = kneg(kmul(ea3,isqrt2));
+    CCTK_REAL_VEC imbar3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED nn = isqrt2;
+    CCTK_REAL_VEC nn CCTK_ATTRIBUTE_UNUSED = isqrt2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1212 = 
+    CCTK_REAL_VEC R1212 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd12gxy,kadd(JacPDstandard2nd21gxy,kmadd(kmadd(gamma122,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma222,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma322))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma221,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(gamma321,kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321)))))),ToReal(2),JacPDstandard2nd22gxx),JacPDstandard2nd11gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1213 = 
+    CCTK_REAL_VEC R1213 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd12gxz,kadd(JacPDstandard2nd31gxy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma232,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma221,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma321,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard2nd23gxx),JacPDstandard2nd11gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1223 = 
+    CCTK_REAL_VEC R1223 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd22gxz,kadd(JacPDstandard2nd31gyy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma232,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma122,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma222,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma322,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard2nd23gxy),JacPDstandard2nd12gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1313 = 
+    CCTK_REAL_VEC R1313 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd13gxz,kadd(JacPDstandard2nd31gxz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma233,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma131,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma231,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma331,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard2nd33gxx),JacPDstandard2nd11gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1323 = 
+    CCTK_REAL_VEC R1323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd23gxz,kadd(JacPDstandard2nd31gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma233,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma232,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331))),gamma332))),ToReal(2),JacPDstandard2nd33gxy),JacPDstandard2nd12gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R2323 = 
+    CCTK_REAL_VEC R2323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard2nd23gyz,kadd(JacPDstandard2nd32gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma122,kmadd(gxyL,gamma222,kmul(gxzL,gamma322))),kmadd(gamma233,kmadd(gxyL,gamma122,kmadd(gyyL,gamma222,kmul(gyzL,gamma322))),kmul(kmadd(gxzL,gamma122,kmadd(gyzL,gamma222,kmul(gzzL,gamma322))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma132,kmadd(gxyL,gamma232,kmul(gxzL,gamma332))),kmadd(gamma232,kmadd(gxyL,gamma132,kmadd(gyyL,gamma232,kmul(gyzL,gamma332))),kmul(gamma332,kmadd(gxzL,gamma132,kmadd(gyzL,gamma232,kmul(gzzL,gamma332)))))),ToReal(2),JacPDstandard2nd33gyy),JacPDstandard2nd22gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1212 = 
+    CCTK_REAL_VEC R4p1212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1213 = 
+    CCTK_REAL_VEC R4p1213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1223 = 
+    CCTK_REAL_VEC R4p1223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kyzL,knmsub(kxzL,kyyL,R1223));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1313 = 
+    CCTK_REAL_VEC R4p1313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1323 = 
+    CCTK_REAL_VEC R4p1323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p2323 = 
+    CCTK_REAL_VEC R4p2323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro111 = ToReal(0);
+    CCTK_REAL_VEC Ro111 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro112 = 
+    CCTK_REAL_VEC Ro112 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma121,kmadd(kxzL,gamma321,kadd(JacPDstandard2nd1kxy,knmsub(kyyL,gamma211,knmsub(kyzL,gamma311,kmsub(kxyL,ksub(gamma221,gamma111),JacPDstandard2nd2kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro113 = 
+    CCTK_REAL_VEC Ro113 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma131,kmadd(kxyL,gamma231,kadd(JacPDstandard2nd1kxz,knmsub(kyzL,gamma211,knmsub(kzzL,gamma311,kmsub(kxzL,ksub(gamma331,gamma111),JacPDstandard2nd3kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro121 = 
+    CCTK_REAL_VEC Ro121 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma211,kmadd(kyzL,gamma311,kadd(JacPDstandard2nd2kxx,knmsub(kxxL,gamma121,knmsub(kxzL,gamma321,kmsub(kxyL,ksub(gamma111,gamma221),JacPDstandard2nd1kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro122 = ToReal(0);
+    CCTK_REAL_VEC Ro122 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro123 = 
+    CCTK_REAL_VEC Ro123 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma131,kmadd(kyyL,gamma231,kadd(JacPDstandard2nd2kxz,knmsub(kxzL,gamma121,knmsub(kzzL,gamma321,kmsub(kyzL,ksub(gamma331,gamma221),JacPDstandard2nd3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro131 = 
+    CCTK_REAL_VEC Ro131 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma211,kmadd(kzzL,gamma311,kadd(JacPDstandard2nd3kxx,knmsub(kxxL,gamma131,knmsub(kxyL,gamma231,kmsub(kxzL,ksub(gamma111,gamma331),JacPDstandard2nd1kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro132 = 
+    CCTK_REAL_VEC Ro132 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma121,kmadd(kzzL,gamma321,kadd(JacPDstandard2nd3kxy,knmsub(kxyL,gamma131,knmsub(kyyL,gamma231,kmsub(kyzL,ksub(gamma221,gamma331),JacPDstandard2nd2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro133 = ToReal(0);
+    CCTK_REAL_VEC Ro133 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro211 = ToReal(0);
+    CCTK_REAL_VEC Ro211 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro212 = 
+    CCTK_REAL_VEC Ro212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma122,kmadd(kxzL,gamma322,kadd(JacPDstandard2nd1kyy,knmsub(kyyL,gamma221,knmsub(kyzL,gamma321,kmsub(kxyL,ksub(gamma222,gamma121),JacPDstandard2nd2kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro213 = 
+    CCTK_REAL_VEC Ro213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxyL,gamma232,kadd(JacPDstandard2nd1kyz,knmsub(kyzL,gamma221,knmsub(kzzL,gamma321,kmsub(kxzL,ksub(gamma332,gamma121),JacPDstandard2nd3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro221 = 
+    CCTK_REAL_VEC Ro221 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma221,kmadd(kyzL,gamma321,kadd(JacPDstandard2nd2kxy,knmsub(kxxL,gamma122,knmsub(kxzL,gamma322,kmsub(kxyL,ksub(gamma121,gamma222),JacPDstandard2nd1kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro222 = ToReal(0);
+    CCTK_REAL_VEC Ro222 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro223 = 
+    CCTK_REAL_VEC Ro223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma132,kmadd(kyyL,gamma232,kadd(JacPDstandard2nd2kyz,knmsub(kxzL,gamma122,knmsub(kzzL,gamma322,kmsub(kyzL,ksub(gamma332,gamma222),JacPDstandard2nd3kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro231 = 
+    CCTK_REAL_VEC Ro231 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma221,kmadd(kzzL,gamma321,kadd(JacPDstandard2nd3kxy,knmsub(kxxL,gamma132,knmsub(kxyL,gamma232,kmsub(kxzL,ksub(gamma121,gamma332),JacPDstandard2nd1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro232 = 
+    CCTK_REAL_VEC Ro232 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma122,kmadd(kzzL,gamma322,kadd(JacPDstandard2nd3kyy,knmsub(kxyL,gamma132,knmsub(kyyL,gamma232,kmsub(kyzL,ksub(gamma222,gamma332),JacPDstandard2nd2kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro233 = ToReal(0);
+    CCTK_REAL_VEC Ro233 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro311 = ToReal(0);
+    CCTK_REAL_VEC Ro311 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro312 = 
+    CCTK_REAL_VEC Ro312 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxzL,gamma332,kadd(JacPDstandard2nd1kyz,knmsub(kyyL,gamma231,knmsub(kyzL,gamma331,kmsub(kxyL,ksub(gamma232,gamma131),JacPDstandard2nd2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro313 = 
+    CCTK_REAL_VEC Ro313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma133,kmadd(kxyL,gamma233,kadd(JacPDstandard2nd1kzz,knmsub(kyzL,gamma231,knmsub(kzzL,gamma331,kmsub(kxzL,ksub(gamma333,gamma131),JacPDstandard2nd3kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro321 = 
+    CCTK_REAL_VEC Ro321 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma231,kmadd(kyzL,gamma331,kadd(JacPDstandard2nd2kxz,knmsub(kxxL,gamma132,knmsub(kxzL,gamma332,kmsub(kxyL,ksub(gamma131,gamma232),JacPDstandard2nd1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro322 = ToReal(0);
+    CCTK_REAL_VEC Ro322 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro323 = 
+    CCTK_REAL_VEC Ro323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma133,kmadd(kyyL,gamma233,kadd(JacPDstandard2nd2kzz,knmsub(kxzL,gamma132,knmsub(kzzL,gamma332,kmsub(kyzL,ksub(gamma333,gamma232),JacPDstandard2nd3kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro331 = 
+    CCTK_REAL_VEC Ro331 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma231,kmadd(kzzL,gamma331,kadd(JacPDstandard2nd3kxz,knmsub(kxxL,gamma133,knmsub(kxyL,gamma233,kmsub(kxzL,ksub(gamma131,gamma333),JacPDstandard2nd1kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro332 = 
+    CCTK_REAL_VEC Ro332 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma132,kmadd(kzzL,gamma332,kadd(JacPDstandard2nd3kyz,knmsub(kxyL,gamma133,knmsub(kyyL,gamma233,kmsub(kyzL,ksub(gamma232,gamma333),JacPDstandard2nd2kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro333 = ToReal(0);
+    CCTK_REAL_VEC Ro333 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo11 = 
+    CCTK_REAL_VEC Rojo11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv23,gInv32),kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv22,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo12 = 
+    CCTK_REAL_VEC Rojo12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv23,R1223,knmsub(gInv21,R1212,knmsub(gInv31,R1213,kmadd(gInv12,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv32,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo13 = 
+    CCTK_REAL_VEC Rojo13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv23),kmadd(gInv13,kmul(kxzL,kxzL),knmsub(gInv21,R1213,knmsub(gInv31,R1313,knmsub(gInv32,R1323,kmadd(gInv12,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv23,kmul(kxxL,gInv13))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo21 = 
+    CCTK_REAL_VEC Rojo21 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv32,R1223,knmsub(gInv12,R1212,knmsub(gInv13,R1213,kmadd(gInv21,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv23,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo22 = 
+    CCTK_REAL_VEC Rojo22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv13,gInv31),kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmadd(gInv11,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo23 = 
+    CCTK_REAL_VEC Rojo23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv12,R1223,knmsub(gInv31,R1323,knmsub(gInv32,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv21,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv23,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo31 = 
+    CCTK_REAL_VEC Rojo31 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv32),kmadd(gInv31,kmul(kxzL,kxzL),knmsub(gInv12,R1213,knmsub(gInv13,R1313,knmsub(gInv23,R1323,kmadd(gInv21,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv32,kmul(kxxL,gInv31))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo32 = 
+    CCTK_REAL_VEC Rojo32 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv21,R1223,knmsub(gInv13,R1323,knmsub(gInv23,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv12,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv32,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo33 = 
+    CCTK_REAL_VEC Rojo33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv12,gInv21),kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)),kmadd(gInv11,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)),kmul(gInv22,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4rL = 
+    CCTK_REAL_VEC Psi4rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2)))))),kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),knmsub(kmul(nn,nn),kmadd(imbar1,kmadd(imbar2,kadd(Rojo12,Rojo21),kmul(imbar3,kadd(Rojo13,Rojo31))),knmsub(rmbar1,kmadd(rmbar2,kadd(Rojo12,Rojo21),kmul(rmbar3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo32,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo11,kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(Rojo22,kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),kmul(Rojo33,kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3))))))))),kmsub(kmadd(kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmsub(imbar1,imbar2,kmul(rmbar1,rmbar2)),kmadd(kmadd(n1,kmul(n2,R4p1213),kmadd(n1,kmul(n3,R4p1313),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2))))),kmsub(imbar1,imbar3,kmul(rmbar1,rmbar3)),kmadd(kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmul(nn,kmadd(kmadd(n1,Ro112,kmadd(n2,Ro122,kmul(n3,Ro132))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro211,kmadd(n2,Ro221,kmul(n3,Ro231))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro113,kmadd(n2,Ro123,kmul(n3,Ro133))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro311,kmadd(n2,Ro321,kmul(n3,Ro331))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro213,kmadd(n2,Ro223,kmul(n3,Ro233))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro312,kmadd(n2,Ro322,kmul(n3,Ro332))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131))),kmsub(rmbar1,rmbar1,kmul(imbar1,imbar1)),kmadd(kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232))),kmsub(rmbar2,rmbar2,kmul(imbar2,imbar2)),kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),kmsub(rmbar3,rmbar3,kmul(imbar3,imbar3))))))))))))))),ToReal(2),kmadd(kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3)),kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4iL = 
+    CCTK_REAL_VEC Psi4iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kmadd(n2,R4p1213,kmul(n3,R4p1313)),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2)))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmul(nn,kmadd(kmadd(im1,kmul(rm1,kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131)))),kmul(im2,kmul(rm2,kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232)))))),ToReal(-2),kmsub(im3,kmul(rm3,kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),ToReal(-2))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(n1,kadd(Ro211,Ro112),kmadd(n3,kadd(Ro231,Ro132),kmul(n2,kadd(Ro221,Ro122)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(n1,kadd(Ro312,Ro213),kmadd(n3,kadd(Ro332,Ro233),kmul(n2,kadd(Ro322,Ro223)))),kmul(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kadd(Ro311,Ro113),kmadd(n3,kadd(Ro331,Ro133),kmul(n2,kadd(Ro321,Ro123)))))))))))),ToReal(2),kmsub(ToReal(-2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2))))))),kmul(im3,kmul(rm3,kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi3rL = 
+    CCTK_REAL_VEC Psi3rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(kmadd(rm1,Rojo11,kmadd(rm2,Rojo12,kmul(rm3,Rojo13))),ksub(n1,ltet1),kmadd(kmadd(rm1,Rojo21,kmadd(rm2,Rojo22,kmul(rm3,Rojo23))),ksub(n2,ltet2),kmul(kmadd(rm1,Rojo31,kmadd(rm2,Rojo32,kmul(rm3,Rojo33))),ksub(n3,ltet3)))),kmadd(n3,kmadd(ltet1,kmadd(n2,kmul(R4p1213,rm1),kmadd(n3,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1223,rm2),kmul(n3,kmul(R4p1323,rm2))))),kmadd(nn,kmul(rm2,kmul(Ro223,kmadd(ltet2,ToReal(-2),n2))),kmadd(nn,kmul(rm3,kmul(Ro333,kmadd(ltet3,ToReal(-2),n3))),knmsub(ltet3,kmadd(n1,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1323,rm1),kmadd(n1,kmul(R4p1323,rm2),kmul(n2,kmul(R4p2323,rm2))))),kmadd(ltet2,kmsub(n3,kmadd(R4p1323,rm1,kmul(R4p2323,rm2)),kmul(n1,kmadd(R4p1213,rm1,kmul(R4p1223,rm2)))),kmadd(nn,kmul(Ro313,kmsub(rm1,ksub(n3,ltet3),kmul(ltet1,rm3))),kmadd(nn,kmul(Ro323,kmsub(rm2,ksub(n3,ltet3),kmul(ltet2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro113,kmadd(ltet1,ToReal(-2),n1)),kmadd(Ro123,kmadd(ltet2,rm1,kmul(rm2,ksub(ltet1,n1))),kmadd(Ro133,kmadd(ltet3,rm1,kmul(rm3,ksub(ltet1,n1))),kmadd(Ro233,kmadd(ltet3,rm2,kmul(rm3,ksub(ltet2,n2))),kmul(Ro213,kmadd(ltet1,rm2,kmul(rm1,ksub(ltet2,n2)))))))))))))))),kmadd(n1,kmadd(ltet3,kmadd(n1,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1223,rm2),kmadd(n1,kmul(R4p1313,rm3),kmul(n2,kmul(R4p1323,rm3))))),kmadd(nn,kmul(rm2,kmul(Ro221,kmadd(ltet2,ToReal(-2),n2))),kmadd(nn,kmul(rm3,kmul(Ro331,kmadd(ltet3,ToReal(-2),n3))),knmsub(ltet1,kmadd(n2,kmul(R4p1212,rm2),kmadd(n3,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1213,rm3),kmul(n3,kmul(R4p1313,rm3))))),kmadd(ltet2,kmsub(n1,kmadd(R4p1212,rm2,kmul(R4p1213,rm3)),kmul(n3,kmadd(R4p1223,rm2,kmul(R4p1323,rm3)))),kmadd(nn,kmsub(Ro121,kmsub(rm2,ksub(n1,ltet1),kmul(ltet2,rm1)),kmul(Ro231,kmadd(ltet3,rm2,kmul(rm3,ksub(ltet2,n2))))),kmadd(nn,kmsub(Ro131,kmsub(rm3,ksub(n1,ltet1),kmul(ltet3,rm1)),kmul(Ro311,kmadd(ltet1,rm3,kmul(rm1,ksub(ltet3,n3))))),kmul(nn,kmsub(rm1,kmul(Ro111,kmadd(ltet1,ToReal(-2),n1)),kmadd(Ro321,kmadd(ltet2,rm3,kmul(rm2,ksub(ltet3,n3))),kmul(Ro211,kmadd(ltet1,rm2,kmul(rm1,ksub(ltet2,n2)))))))))))))),kmul(n2,kmadd(ltet3,kmadd(n1,kmul(R4p1323,rm3),kmsub(n2,kmul(R4p2323,rm3),kmul(rm1,kmadd(n2,R4p1223,kmul(n1,R4p1213))))),kmadd(ltet1,kmsub(kmadd(n2,R4p1212,kmul(n3,R4p1213)),rm1,kmul(rm3,kmadd(n3,R4p1323,kmul(n2,R4p1223)))),kmadd(ltet2,kmadd(rm1,kmsub(n3,R4p1223,kmul(n1,R4p1212)),kmul(rm3,kmsub(n1,R4p1223,kmul(n3,R4p2323)))),kmul(nn,kmadd(rm1,kmul(Ro112,kmadd(ltet1,ToReal(-2),n1)),kmadd(rm2,kmul(Ro222,kmadd(ltet2,ToReal(-2),n2)),kmadd(rm3,kmul(Ro332,kmadd(ltet3,ToReal(-2),n3)),kmadd(Ro212,kmsub(rm1,ksub(n2,ltet2),kmul(ltet1,rm2)),kmsub(Ro232,kmsub(rm3,ksub(n2,ltet2),kmul(ltet3,rm2)),kmadd(Ro122,kmadd(ltet2,rm1,kmul(rm2,ksub(ltet1,n1))),kmadd(Ro132,kmadd(ltet3,rm1,kmul(rm3,ksub(ltet1,n1))),kmadd(Ro322,kmadd(ltet2,rm3,kmul(rm2,ksub(ltet3,n3))),kmul(Ro312,kmadd(ltet1,rm3,kmul(rm1,ksub(ltet3,n3))))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi3iL = 
+    CCTK_REAL_VEC Psi3iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmul(nn,nn),kmadd(kmadd(im1,Rojo11,kmadd(im2,Rojo12,kmul(im3,Rojo13))),ksub(n1,ltet1),kmadd(kmadd(im1,Rojo21,kmadd(im2,Rojo22,kmul(im3,Rojo23))),ksub(n2,ltet2),kmul(kmadd(im1,Rojo31,kmadd(im2,Rojo32,kmul(im3,Rojo33))),ksub(n3,ltet3)))),kmadd(n1,kmul(nn,kmul(Ro121,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n2,kmul(nn,kmul(Ro122,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n3,kmul(nn,kmul(Ro123,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n1,kmul(nn,kmul(Ro131,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n2,kmul(nn,kmul(Ro132,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n3,kmul(nn,kmul(Ro133,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n1,kmul(nn,kmul(Ro211,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n2,kmul(nn,kmul(Ro212,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n3,kmul(nn,kmul(Ro213,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n1,kmul(nn,kmul(Ro231,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n2,kmul(nn,kmul(Ro232,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n3,kmul(nn,kmul(Ro233,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n1,kmul(nn,kmul(Ro311,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n2,kmul(nn,kmul(Ro312,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n3,kmul(nn,kmul(Ro313,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n1,kmul(nn,kmul(Ro321,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(n2,kmul(nn,kmul(Ro322,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(n3,kmul(nn,kmul(Ro323,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(im2,kmul(n1,kmul(nn,kmul(Ro221,kmsub(ltet2,ToReal(2),n2)))),kmadd(im2,kmul(n2,kmul(nn,kmul(Ro222,kmsub(ltet2,ToReal(2),n2)))),kmadd(im2,kmul(n3,kmul(nn,kmul(Ro223,kmsub(ltet2,ToReal(2),n2)))),kmadd(im3,kmul(n1,kmul(nn,kmul(Ro331,kmsub(ltet3,ToReal(2),n3)))),kmadd(im3,kmul(n2,kmul(nn,kmul(Ro332,kmsub(ltet3,ToReal(2),n3)))),kmadd(im3,kmul(n3,kmul(nn,kmul(Ro333,kmsub(ltet3,ToReal(2),n3)))),kmadd(n1,knmsub(im2,kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3))))),kmsub(im1,kmul(nn,kmul(Ro111,kmsub(ltet1,ToReal(2),n1))),kmul(im3,kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)))))))),kmadd(n2,kmsub(im1,kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmadd(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3)),kmul(nn,kmul(Ro112,kmsub(ltet1,ToReal(2),n1)))))),kmul(im3,kmadd(R4p1223,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1323,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p2323,kmsub(ltet3,n2,kmul(ltet2,n3))))))),kmul(n3,kmsub(im1,kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmadd(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)),kmul(nn,kmul(Ro113,kmsub(ltet1,ToReal(2),n1)))))),kmul(im2,kmadd(R4p1223,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1323,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p2323,kmsub(ltet2,n3,kmul(ltet3,n2)))))))))))))))))))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi2rL = 
+    CCTK_REAL_VEC Psi2rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(ltet2,kmul(n2,R4p1212),kmadd(ltet3,kmul(n2,R4p1213),kmadd(ltet2,kmul(n3,R4p1213),kmul(ltet3,kmul(n3,R4p1313))))),kmadd(im1,im1,kmul(rm1,rm1)),knmsub(kmadd(ltet1,kmul(n1,R4p1313),kmadd(ltet2,kmul(n1,R4p1323),kmadd(ltet1,kmul(n2,R4p1323),kmul(ltet2,kmul(n2,R4p2323))))),kmadd(im3,im3,kmul(rm3,rm3)),knmsub(kmul(nn,nn),kmadd(im2,kmul(im3,Rojo23),kmadd(rm2,kmul(rm3,Rojo23),kmadd(im1,kmadd(im2,kadd(Rojo12,Rojo21),kmul(im3,kadd(Rojo13,Rojo31))),kmadd(rm1,kmadd(rm2,kadd(Rojo12,Rojo21),kmul(rm3,kadd(Rojo13,Rojo31))),kmadd(im2,kmul(im3,Rojo32),kmadd(rm2,kmul(rm3,Rojo32),kmadd(Rojo11,kmul(im1,im1),kmadd(Rojo22,kmul(im2,im2),kmadd(Rojo33,kmul(im3,im3),kmadd(Rojo11,kmul(rm1,rm1),kmadd(Rojo22,kmul(rm2,rm2),kmul(Rojo33,kmul(rm3,rm3))))))))))))),knmsub(kmadd(im2,im2,kmul(rm2,rm2)),kmadd(n3,kmsub(ltet3,R4p2323,kmul(ltet1,R4p1223)),kmul(n1,kmsub(ltet1,R4p1212,kmul(ltet3,R4p1223)))),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmadd(ltet2,kmul(n3,R4p2323),kmadd(ltet3,kmadd(n1,R4p1323,kmul(n2,R4p2323)),kmsub(ltet1,kmsub(n3,R4p1323,kmadd(n2,R4p1223,kmul(n1,R4p1213))),kmul(n1,kmadd(ltet2,R4p1223,kmul(ltet1,R4p1213)))))),kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmadd(ltet1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmadd(ltet3,kmadd(n1,R4p1213,kmsub(n3,kmul(R4p1323,ToReal(-2)),kmul(n2,R4p1223))),kmul(ltet2,kmsub(n1,R4p1212,kmul(n3,R4p1223))))),kmadd(nn,kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmul(Ro211,ksub(n1,ltet1)),kmadd(kmadd(im1,im3,kmul(rm1,rm3)),kmul(Ro311,ksub(n1,ltet1)),kmadd(Ro111,kmul(kmadd(im1,im1,kmul(rm1,rm1)),ksub(n1,ltet1)),kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmul(Ro122,ksub(n2,ltet2)),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmul(Ro322,ksub(n2,ltet2)),kmadd(Ro222,kmul(kmadd(im2,im2,kmul(rm2,rm2)),ksub(n2,ltet2)),kmadd(kmadd(im1,im3,kmul(rm1,rm3)),kmul(Ro133,ksub(n3,ltet3)),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmul(Ro233,ksub(n3,ltet3)),kmadd(Ro333,kmul(kmadd(im3,im3,kmul(rm3,rm3)),ksub(n3,ltet3)),kmadd(Ro112,kmsub(n2,kmadd(im1,im1,kmul(rm1,rm1)),kmul(ltet1,kmadd(im1,im2,kmul(rm1,rm2)))),kmadd(Ro221,kmsub(n1,kmadd(im2,im2,kmul(rm2,rm2)),kmul(ltet2,kmadd(im1,im2,kmul(rm1,rm2)))),kmadd(Ro113,kmsub(n3,kmadd(im1,im1,kmul(rm1,rm1)),kmul(ltet1,kmadd(im1,im3,kmul(rm1,rm3)))),kmadd(Ro331,kmsub(n1,kmadd(im3,im3,kmul(rm3,rm3)),kmul(ltet3,kmadd(im1,im3,kmul(rm1,rm3)))),kmadd(Ro223,kmsub(n3,kmadd(im2,im2,kmul(rm2,rm2)),kmul(ltet2,kmadd(im2,im3,kmul(rm2,rm3)))),kmadd(Ro332,kmsub(n2,kmadd(im3,im3,kmul(rm3,rm3)),kmul(ltet3,kmadd(im2,im3,kmul(rm2,rm3)))),kmadd(Ro121,kmsub(n1,kmadd(im1,im2,kmul(rm1,rm2)),kmul(ltet2,kmadd(im1,im1,kmul(rm1,rm1)))),kmadd(Ro131,kmsub(n1,kmadd(im1,im3,kmul(rm1,rm3)),kmul(ltet3,kmadd(im1,im1,kmul(rm1,rm1)))),kmadd(Ro212,kmsub(n2,kmadd(im1,im2,kmul(rm1,rm2)),kmul(ltet1,kmadd(im2,im2,kmul(rm2,rm2)))),kmadd(Ro232,kmsub(n2,kmadd(im2,im3,kmul(rm2,rm3)),kmul(ltet3,kmadd(im2,im2,kmul(rm2,rm2)))),kmadd(Ro313,kmsub(n3,kmadd(im1,im3,kmul(rm1,rm3)),kmul(ltet1,kmadd(im3,im3,kmul(rm3,rm3)))),kmadd(Ro323,kmsub(n3,kmadd(im2,im3,kmul(rm2,rm3)),kmul(ltet2,kmadd(im3,im3,kmul(rm3,rm3)))),kmadd(Ro321,kmadd(im3,kmsub(im2,n1,kmul(im1,ltet2)),kmul(rm3,kmsub(n1,rm2,kmul(ltet2,rm1)))),kmadd(Ro231,kmadd(im2,kmsub(im3,n1,kmul(im1,ltet3)),kmul(rm2,kmsub(n1,rm3,kmul(ltet3,rm1)))),kmadd(Ro312,kmadd(im3,kmsub(im1,n2,kmul(im2,ltet1)),kmul(rm3,kmsub(n2,rm1,kmul(ltet1,rm2)))),kmadd(Ro132,kmadd(im1,kmsub(im3,n2,kmul(im2,ltet3)),kmul(rm1,kmsub(n2,rm3,kmul(ltet3,rm2)))),kmadd(Ro213,kmadd(im2,kmsub(im1,n3,kmul(im3,ltet1)),kmul(rm2,kmsub(n3,rm1,kmul(ltet1,rm3)))),kmul(Ro123,kmadd(im1,kmsub(im2,n3,kmul(im3,ltet2)),kmul(rm1,kmsub(n3,rm2,kmul(ltet2,rm3))))))))))))))))))))))))))))))),kmul(kmadd(im1,im3,kmul(rm1,rm3)),kmadd(ltet2,kmul(n1,R4p1213),kmadd(ltet1,kmul(n2,R4p1213),kmadd(ltet3,kmul(n1,R4p1313),kmadd(ltet1,kmul(n3,R4p1313),kmadd(ltet3,kmul(n2,R4p1323),kmadd(ltet2,kmul(n3,R4p1323),kmul(ltet2,kmul(n2,kmul(R4p1223,ToReal(2))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi2iL = 
+    CCTK_REAL_VEC Psi2iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmsub(im3,rm1,kmul(im1,rm3)),kmadd(R4p1213,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1313,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1323,kmsub(ltet2,n3,kmul(ltet3,n2))))),kmadd(kmsub(im2,rm1,kmul(im1,rm2)),kmadd(ltet1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmsub(R4p1223,kmsub(ltet2,n3,kmul(ltet3,n2)),kmul(n1,kmadd(ltet3,R4p1213,kmul(ltet2,R4p1212))))),kmadd(kmsub(im3,rm2,kmul(im2,rm3)),kmadd(ltet1,kmadd(n1,R4p1213,kmul(n2,R4p1223)),kmadd(ltet1,kmul(n3,R4p1323),kmsub(ltet2,kmul(n3,R4p2323),kmadd(n1,kmadd(ltet2,R4p1223,kmul(ltet1,R4p1213)),kmul(ltet3,kmadd(n1,R4p1323,kmul(n2,R4p2323))))))),kmsub(kmul(nn,nn),kmadd(im1,kmadd(rm2,ksub(Rojo21,Rojo12),kmul(rm3,ksub(Rojo31,Rojo13))),kmadd(im2,kmadd(rm1,ksub(Rojo12,Rojo21),kmul(rm3,ksub(Rojo32,Rojo23))),kmul(im3,kmadd(rm1,ksub(Rojo13,Rojo31),kmul(rm2,ksub(Rojo23,Rojo32)))))),kmul(nn,kmadd(im1,kmadd(n2,kmul(rm2,Ro212),kmadd(n3,kmul(rm2,Ro213),kmadd(ltet2,kmul(rm2,Ro221),kmadd(ltet3,kmul(rm2,Ro231),kmadd(n2,kmul(rm3,Ro312),kmadd(n3,kmul(rm3,Ro313),kmadd(ltet2,kmul(rm3,Ro321),kmadd(ltet3,kmul(rm3,Ro331),knmsub(rm2,kmadd(n3,Ro123,kmadd(Ro122,kadd(n2,ltet2),kmul(ltet3,Ro132))),knmsub(rm3,kmadd(ltet2,Ro123,kmadd(Ro133,kadd(n3,ltet3),kmul(n2,Ro132))),kmadd(ltet1,kmadd(rm2,ksub(Ro211,Ro112),kmul(rm3,ksub(Ro311,Ro113))),kmul(n1,kmadd(rm2,ksub(Ro211,Ro121),kmul(rm3,ksub(Ro311,Ro131))))))))))))))),kmadd(im2,kmadd(ltet2,kmul(rm3,Ro322),kmadd(n2,kmul(rm3,Ro322),kmadd(n3,kmul(rm3,Ro323),kmadd(ltet3,kmul(rm3,Ro332),knmsub(rm3,kmadd(ltet2,Ro223,kmadd(Ro233,kadd(n3,ltet3),kmul(n2,Ro232))),kmadd(ltet1,kmadd(rm1,ksub(Ro112,Ro211),kmul(rm3,ksub(Ro312,Ro213))),kmadd(rm1,kmadd(n2,ksub(Ro122,Ro212),kmadd(n3,ksub(Ro123,Ro213),kmadd(ltet2,ksub(Ro122,Ro221),kmul(ltet3,ksub(Ro132,Ro231))))),kmul(n1,kmadd(rm1,ksub(Ro121,Ro211),kmul(rm3,ksub(Ro321,Ro231))))))))))),kmul(im3,kmadd(rm1,kmadd(kadd(ltet3,n3),Ro133,knmsub(n3,Ro313,knmsub(ltet3,Ro331,kmadd(n1,ksub(Ro131,Ro311),kmul(n2,ksub(Ro132,Ro312)))))),kmadd(ltet1,kmadd(rm1,ksub(Ro113,Ro311),kmul(rm2,ksub(Ro213,Ro312))),kmadd(ltet2,kmadd(rm1,ksub(Ro123,Ro321),kmul(rm2,ksub(Ro223,Ro322))),kmul(rm2,kmadd(kadd(ltet3,n3),Ro233,knmsub(n3,Ro323,knmsub(ltet3,Ro332,kmadd(n1,ksub(Ro231,Ro321),kmul(n2,ksub(Ro232,Ro322))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi1rL = 
+    CCTK_REAL_VEC Psi1rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(kmadd(rm1,Rojo11,kmadd(rm2,Rojo12,kmul(rm3,Rojo13))),ksub(ltet1,n1),kmadd(rm1,kmadd(Rojo21,ksub(ltet2,n2),kmul(Rojo31,ksub(ltet3,n3))),kmadd(rm2,kmadd(Rojo22,ksub(ltet2,n2),kmul(Rojo32,ksub(ltet3,n3))),kmul(rm3,kmadd(Rojo23,ksub(ltet2,n2),kmul(Rojo33,ksub(ltet3,n3))))))),kmadd(ltet1,kmadd(ltet1,kmadd(n2,kmul(R4p1212,rm2),kmadd(n3,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1213,rm3),kmul(n3,kmul(R4p1313,rm3))))),kmadd(nn,kmul(rm2,kmul(Ro221,kmadd(n2,ToReal(-2),ltet2))),kmadd(nn,kmul(rm3,kmul(Ro331,kmadd(n3,ToReal(-2),ltet3))),knmsub(ltet3,kmadd(n1,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1223,rm2),kmadd(n1,kmul(R4p1313,rm3),kmul(n2,kmul(R4p1323,rm3))))),kmadd(ltet2,kmsub(n3,kmadd(R4p1223,rm2,kmul(R4p1323,rm3)),kmul(n1,kmadd(R4p1212,rm2,kmul(R4p1213,rm3)))),kmadd(nn,kmul(Ro121,kmsub(rm2,ksub(ltet1,n1),kmul(n2,rm1))),kmadd(nn,kmul(Ro131,kmsub(rm3,ksub(ltet1,n1),kmul(n3,rm1))),kmadd(nn,kmul(Ro211,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2))),kmadd(nn,kmul(Ro311,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3))),kmadd(nn,kmul(Ro321,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro111,kmadd(n1,ToReal(-2),ltet1)),kmul(Ro231,kmadd(n3,rm2,kmul(rm3,ksub(n2,ltet2)))))))))))))))),kmadd(ltet3,kmadd(ltet3,kmadd(n1,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1323,rm1),kmadd(n1,kmul(R4p1323,rm2),kmul(n2,kmul(R4p2323,rm2))))),kmadd(nn,kmul(rm2,kmul(Ro223,kmadd(n2,ToReal(-2),ltet2))),kmadd(nn,kmul(rm3,kmul(Ro333,kmadd(n3,ToReal(-2),ltet3))),knmsub(ltet1,kmadd(n2,kmul(R4p1213,rm1),kmadd(n3,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1223,rm2),kmul(n3,kmul(R4p1323,rm2))))),kmadd(ltet2,kmsub(n1,kmadd(R4p1213,rm1,kmul(R4p1223,rm2)),kmul(n3,kmadd(R4p1323,rm1,kmul(R4p2323,rm2)))),kmadd(nn,kmul(Ro213,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2))),kmadd(nn,kmul(Ro313,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3))),kmadd(nn,kmul(Ro323,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro113,kmadd(n1,ToReal(-2),ltet1)),kmadd(Ro123,kmadd(n2,rm1,kmul(rm2,ksub(n1,ltet1))),kmadd(Ro233,kmadd(n3,rm2,kmul(rm3,ksub(n2,ltet2))),kmul(Ro133,kmadd(n3,rm1,kmul(rm3,ksub(n1,ltet1)))))))))))))))),kmul(ltet2,kmadd(ltet1,kmadd(n2,kmul(R4p1223,rm3),kmsub(n3,kmul(R4p1323,rm3),kmul(rm1,kmadd(n3,R4p1213,kmul(n2,R4p1212))))),kmadd(ltet2,kmadd(rm3,kmsub(n3,R4p2323,kmul(n1,R4p1223)),kmul(rm1,kmsub(n1,R4p1212,kmul(n3,R4p1223)))),kmadd(ltet3,kmsub(kmadd(n1,R4p1213,kmul(n2,R4p1223)),rm1,kmul(rm3,kmadd(n2,R4p2323,kmul(n1,R4p1323)))),kmul(nn,kmadd(rm1,kmul(Ro112,kmadd(n1,ToReal(-2),ltet1)),kmadd(rm2,kmul(Ro222,kmadd(n2,ToReal(-2),ltet2)),kmadd(rm3,kmul(Ro332,kmadd(n3,ToReal(-2),ltet3)),knmsub(Ro122,kmadd(n2,rm1,kmul(rm2,ksub(n1,ltet1))),knmsub(Ro132,kmadd(n3,rm1,kmul(rm3,ksub(n1,ltet1))),kmadd(Ro212,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2)),kmadd(Ro232,kmsub(rm3,ksub(ltet2,n2),kmul(n3,rm2)),kmadd(Ro312,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3)),kmul(Ro322,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3)))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi1iL = 
+    CCTK_REAL_VEC Psi1iL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(im1,kmadd(Rojo11,ksub(ltet1,n1),kmadd(Rojo21,ksub(ltet2,n2),kmul(Rojo31,ksub(ltet3,n3)))),kmadd(im2,kmadd(Rojo12,ksub(ltet1,n1),kmadd(Rojo22,ksub(ltet2,n2),kmul(Rojo32,ksub(ltet3,n3)))),kmul(im3,kmadd(Rojo13,ksub(ltet1,n1),kmadd(Rojo23,ksub(ltet2,n2),kmul(Rojo33,ksub(ltet3,n3))))))),kmadd(ltet1,kmadd(im2,kmadd(nn,kmul(Ro221,kmadd(n2,ToReal(-2),ltet2)),kmadd(R4p1212,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1213,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1223,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmadd(im3,kmadd(nn,kmul(Ro331,kmadd(n3,ToReal(-2),ltet3)),kmadd(R4p1213,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1313,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1323,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmul(nn,kmadd(im1,kmul(Ro111,kmadd(n1,ToReal(-2),ltet1)),knmsub(Ro211,kmadd(im2,n1,kmul(im1,ksub(n2,ltet2))),knmsub(Ro311,kmadd(im3,n1,kmul(im1,ksub(n3,ltet3))),knmsub(Ro321,kmadd(im3,n2,kmul(im2,ksub(n3,ltet3))),kmadd(Ro121,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro131,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmul(Ro231,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)))))))))))),kmadd(ltet2,kmadd(im3,kmadd(nn,kmul(Ro332,kmadd(n3,ToReal(-2),ltet3)),kmadd(R4p1223,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1323,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p2323,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmadd(im1,kmadd(nn,kmul(Ro112,kmadd(n1,ToReal(-2),ltet1)),kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmul(nn,kmadd(im2,kmul(Ro222,kmadd(n2,ToReal(-2),ltet2)),knmsub(Ro312,kmadd(im3,n1,kmul(im1,ksub(n3,ltet3))),knmsub(Ro322,kmadd(im3,n2,kmul(im2,ksub(n3,ltet3))),kmadd(Ro122,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro132,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmadd(Ro212,kmsub(im1,ksub(ltet2,n2),kmul(im2,n1)),kmul(Ro232,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)))))))))))),kmul(ltet3,kmadd(im1,kmadd(nn,kmul(Ro113,kmadd(n1,ToReal(-2),ltet1)),kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmadd(im2,kmadd(nn,kmul(Ro223,kmadd(n2,ToReal(-2),ltet2)),kmadd(R4p1223,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1323,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p2323,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmul(nn,kmadd(im3,kmul(Ro333,kmadd(n3,ToReal(-2),ltet3)),knmsub(Ro213,kmadd(im2,n1,kmul(im1,ksub(n2,ltet2))),kmadd(Ro123,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro133,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmadd(Ro233,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)),kmadd(Ro313,kmsub(im1,ksub(ltet3,n3),kmul(im3,n1)),kmul(Ro323,kmsub(im2,ksub(ltet3,n3),kmul(im3,n2))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi0rL = 
+    CCTK_REAL_VEC Psi0rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet3,ltet3),kmul(ltet1,kmul(ltet3,kmul(R4p1223,ToReal(-2)))))),kmsub(im2,im2,kmul(rm2,rm2)),knmsub(kmul(nn,nn),kmadd(im1,kmadd(im2,kadd(Rojo12,Rojo21),kmul(im3,kadd(Rojo13,Rojo31))),knmsub(rm1,kmadd(rm2,kadd(Rojo12,Rojo21),kmul(rm3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(im2,im3,kmul(rm2,rm3)),kmadd(Rojo32,kmsub(im2,im3,kmul(rm2,rm3)),kmadd(Rojo11,kmsub(im1,im1,kmul(rm1,rm1)),kmadd(Rojo22,kmsub(im2,im2,kmul(rm2,rm2)),kmul(Rojo33,kmsub(im3,im3,kmul(rm3,rm3))))))))),kmsub(kmadd(kmsub(ltet1,kmadd(ltet2,R4p1212,kmul(ltet3,R4p1213)),kmul(ltet3,kmadd(ltet2,R4p1223,kmul(ltet3,R4p1323)))),kmsub(im1,im2,kmul(rm1,rm2)),kmadd(kmadd(ltet1,kmul(ltet2,R4p1213),kmadd(ltet1,kmul(ltet3,R4p1313),kmadd(ltet2,kmul(ltet3,R4p1323),kmul(R4p1223,kmul(ltet2,ltet2))))),kmsub(im1,im3,kmul(rm1,rm3)),kmadd(kmsub(rm2,rm3,kmul(im2,im3)),kmadd(R4p1213,kmul(ltet1,ltet1),kmsub(ltet1,kmsub(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet2,kmul(ltet3,R4p2323)))),kmul(nn,kmadd(kmadd(ltet1,Ro112,kmadd(ltet2,Ro122,kmul(ltet3,Ro132))),kmsub(rm1,rm2,kmul(im1,im2)),kmadd(kmadd(ltet1,Ro211,kmadd(ltet2,Ro221,kmul(ltet3,Ro231))),kmsub(rm1,rm2,kmul(im1,im2)),kmadd(kmadd(ltet1,Ro113,kmadd(ltet2,Ro123,kmul(ltet3,Ro133))),kmsub(rm1,rm3,kmul(im1,im3)),kmadd(kmadd(ltet1,Ro311,kmadd(ltet2,Ro321,kmul(ltet3,Ro331))),kmsub(rm1,rm3,kmul(im1,im3)),kmadd(kmadd(ltet1,Ro213,kmadd(ltet2,Ro223,kmul(ltet3,Ro233))),kmsub(rm2,rm3,kmul(im2,im3)),kmadd(kmadd(ltet1,Ro312,kmadd(ltet2,Ro322,kmul(ltet3,Ro332))),kmsub(rm2,rm3,kmul(im2,im3)),kmadd(kmadd(ltet1,Ro111,kmadd(ltet2,Ro121,kmul(ltet3,Ro131))),kmsub(rm1,rm1,kmul(im1,im1)),kmadd(kmadd(ltet1,Ro212,kmadd(ltet2,Ro222,kmul(ltet3,Ro232))),kmsub(rm2,rm2,kmul(im2,im2)),kmul(kmadd(ltet1,Ro313,kmadd(ltet2,Ro323,kmul(ltet3,Ro333))),kmsub(rm3,rm3,kmul(im3,im3))))))))))))))),ToReal(2),kmadd(kmsub(im3,im3,kmul(rm3,rm3)),kmadd(R4p1313,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet2,ltet2),kmul(ltet1,kmul(ltet2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(im1,im1,kmul(rm1,rm1)),kmadd(R4p1212,kmul(ltet2,ltet2),kmadd(R4p1313,kmul(ltet3,ltet3),kmul(ltet2,kmul(ltet3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi0iL = 
+    CCTK_REAL_VEC Psi0iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmul(kmadd(ltet1,kmadd(ltet2,R4p1213,kmul(ltet3,R4p1313)),kmadd(ltet2,kmul(ltet3,R4p1323),kmul(R4p1223,kmul(ltet2,ltet2)))),ToReal(-2)),kmadd(ToReal(2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet3,ltet3),kmul(ltet1,kmul(ltet3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(ltet3,kmadd(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet1,kmadd(ltet2,R4p1212,kmul(ltet3,R4p1213)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(ltet1,ltet1),kmsub(ltet1,kmsub(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet2,kmul(ltet3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(ltet2,ltet2),kmadd(R4p1313,kmul(ltet3,ltet3),kmul(ltet2,kmul(ltet3,kmul(R4p1213,ToReal(2))))))),kmadd(im3,kmul(rm3,kmadd(R4p1313,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet2,ltet2),kmul(ltet1,kmul(ltet2,kmul(R4p1323,ToReal(2))))))),kmul(nn,kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(ltet1,kadd(Ro112,Ro211),kmadd(ltet2,kadd(Ro122,Ro221),kmul(ltet3,kadd(Ro132,Ro231)))),kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(ltet1,kadd(Ro113,Ro311),kmadd(ltet2,kadd(Ro123,Ro321),kmul(ltet3,kadd(Ro133,Ro331)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(ltet1,kadd(Ro213,Ro312),kmadd(ltet2,kadd(Ro223,Ro322),kmul(ltet3,kadd(Ro233,Ro332)))),kmul(kmadd(im1,kmul(rm1,kmadd(ltet1,Ro111,kmadd(ltet2,Ro121,kmul(ltet3,Ro131)))),kmadd(im2,kmul(rm2,kmadd(ltet1,Ro212,kmadd(ltet2,Ro222,kmul(ltet3,Ro232)))),kmul(im3,kmul(rm3,kmadd(ltet1,Ro313,kmadd(ltet2,Ro323,kmul(ltet3,Ro333))))))),ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_psis_calc_4th.cc b/src/WeylScal4_psis_calc_4th.cc
index 55fdca1..d32959e 100644
--- a/src/WeylScal4_psis_calc_4th.cc
+++ b/src/WeylScal4_psis_calc_4th.cc
@@ -92,13 +92,18 @@ static void WeylScal4_psis_calc_4th_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -143,9 +148,9 @@ static void WeylScal4_psis_calc_4th_Body(const cGH* restrict const cctkGH, const
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -162,26 +167,6 @@ static void WeylScal4_psis_calc_4th_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -1019,380 +1004,380 @@ static void WeylScal4_psis_calc_4th_Body(const cGH* restrict const cctkGH, const
       JacPDstandard4th32gyz = PDstandard4th23gyz;
     }
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED detg = 
+    CCTK_REAL_VEC detg CCTK_ATTRIBUTE_UNUSED = 
       knmsub(gyyL,kmul(gxzL,gxzL),knmsub(gxxL,kmul(gyzL,gyzL),kmadd(gzzL,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)),kmul(gxyL,kmul(gxzL,kmul(gyzL,ToReal(2)))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED invdetg = kdiv(ToReal(1),detg);
+    CCTK_REAL_VEC invdetg CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(1),detg);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv11 = 
+    CCTK_REAL_VEC gInv11 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gyyL,gzzL,kmul(gyzL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv12 = 
+    CCTK_REAL_VEC gInv12 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv13 = 
+    CCTK_REAL_VEC gInv13 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv21 = 
+    CCTK_REAL_VEC gInv21 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv22 = 
+    CCTK_REAL_VEC gInv22 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gzzL,kmul(gxzL,gxzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv23 = 
+    CCTK_REAL_VEC gInv23 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv31 = 
+    CCTK_REAL_VEC gInv31 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv32 = 
+    CCTK_REAL_VEC gInv32 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv33 = 
+    CCTK_REAL_VEC gInv33 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma111 = 
+    CCTK_REAL_VEC gamma111 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv11,JacPDstandard4th1gxx,knmsub(gInv12,JacPDstandard4th2gxx,kmsub(kmadd(gInv12,JacPDstandard4th1gxy,kmul(gInv13,JacPDstandard4th1gxz)),ToReal(2),kmul(gInv13,JacPDstandard4th3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma211 = 
+    CCTK_REAL_VEC gamma211 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv21,JacPDstandard4th1gxx,knmsub(gInv22,JacPDstandard4th2gxx,kmsub(kmadd(gInv22,JacPDstandard4th1gxy,kmul(gInv23,JacPDstandard4th1gxz)),ToReal(2),kmul(gInv23,JacPDstandard4th3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma311 = 
+    CCTK_REAL_VEC gamma311 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv31,JacPDstandard4th1gxx,knmsub(gInv32,JacPDstandard4th2gxx,kmsub(kmadd(gInv32,JacPDstandard4th1gxy,kmul(gInv33,JacPDstandard4th1gxz)),ToReal(2),kmul(gInv33,JacPDstandard4th3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma121 = 
+    CCTK_REAL_VEC gamma121 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv12,JacPDstandard4th1gyy,kmadd(gInv11,JacPDstandard4th2gxx,kmul(gInv13,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th2gxz,JacPDstandard4th3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma221 = 
+    CCTK_REAL_VEC gamma221 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv22,JacPDstandard4th1gyy,kmadd(gInv21,JacPDstandard4th2gxx,kmul(gInv23,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th2gxz,JacPDstandard4th3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma321 = 
+    CCTK_REAL_VEC gamma321 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv32,JacPDstandard4th1gyy,kmadd(gInv31,JacPDstandard4th2gxx,kmul(gInv33,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th2gxz,JacPDstandard4th3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma131 = 
+    CCTK_REAL_VEC gamma131 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard4th1gzz,kmadd(gInv11,JacPDstandard4th3gxx,kmul(gInv12,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th3gxy,JacPDstandard4th2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma231 = 
+    CCTK_REAL_VEC gamma231 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard4th1gzz,kmadd(gInv21,JacPDstandard4th3gxx,kmul(gInv22,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th3gxy,JacPDstandard4th2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma331 = 
+    CCTK_REAL_VEC gamma331 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard4th1gzz,kmadd(gInv31,JacPDstandard4th3gxx,kmul(gInv32,kadd(JacPDstandard4th1gyz,ksub(JacPDstandard4th3gxy,JacPDstandard4th2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma122 = 
+    CCTK_REAL_VEC gamma122 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv12,JacPDstandard4th2gyy,kmadd(gInv11,kmsub(JacPDstandard4th2gxy,ToReal(2),JacPDstandard4th1gyy),kmul(gInv13,kmsub(JacPDstandard4th2gyz,ToReal(2),JacPDstandard4th3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma222 = 
+    CCTK_REAL_VEC gamma222 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv22,JacPDstandard4th2gyy,kmadd(gInv21,kmsub(JacPDstandard4th2gxy,ToReal(2),JacPDstandard4th1gyy),kmul(gInv23,kmsub(JacPDstandard4th2gyz,ToReal(2),JacPDstandard4th3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma322 = 
+    CCTK_REAL_VEC gamma322 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv32,JacPDstandard4th2gyy,kmadd(gInv31,kmsub(JacPDstandard4th2gxy,ToReal(2),JacPDstandard4th1gyy),kmul(gInv33,kmsub(JacPDstandard4th2gyz,ToReal(2),JacPDstandard4th3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma132 = 
+    CCTK_REAL_VEC gamma132 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard4th2gzz,kmadd(gInv12,JacPDstandard4th3gyy,kmul(gInv11,kadd(JacPDstandard4th2gxz,ksub(JacPDstandard4th3gxy,JacPDstandard4th1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma232 = 
+    CCTK_REAL_VEC gamma232 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard4th2gzz,kmadd(gInv22,JacPDstandard4th3gyy,kmul(gInv21,kadd(JacPDstandard4th2gxz,ksub(JacPDstandard4th3gxy,JacPDstandard4th1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma332 = 
+    CCTK_REAL_VEC gamma332 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard4th2gzz,kmadd(gInv32,JacPDstandard4th3gyy,kmul(gInv31,kadd(JacPDstandard4th2gxz,ksub(JacPDstandard4th3gxy,JacPDstandard4th1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma133 = 
+    CCTK_REAL_VEC gamma133 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv13,JacPDstandard4th3gzz,kmadd(gInv11,kmsub(JacPDstandard4th3gxz,ToReal(2),JacPDstandard4th1gzz),kmul(gInv12,kmsub(JacPDstandard4th3gyz,ToReal(2),JacPDstandard4th2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma233 = 
+    CCTK_REAL_VEC gamma233 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv23,JacPDstandard4th3gzz,kmadd(gInv21,kmsub(JacPDstandard4th3gxz,ToReal(2),JacPDstandard4th1gzz),kmul(gInv22,kmsub(JacPDstandard4th3gyz,ToReal(2),JacPDstandard4th2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma333 = 
+    CCTK_REAL_VEC gamma333 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv33,JacPDstandard4th3gzz,kmadd(gInv31,kmsub(JacPDstandard4th3gxz,ToReal(2),JacPDstandard4th1gzz),kmul(gInv32,kmsub(JacPDstandard4th3gyz,ToReal(2),JacPDstandard4th2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED xmoved = ksub(xL,ToReal(xorig));
+    CCTK_REAL_VEC xmoved CCTK_ATTRIBUTE_UNUSED = ksub(xL,ToReal(xorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ymoved = ksub(yL,ToReal(yorig));
+    CCTK_REAL_VEC ymoved CCTK_ATTRIBUTE_UNUSED = ksub(yL,ToReal(yorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED zmoved = ksub(zL,ToReal(zorig));
+    CCTK_REAL_VEC zmoved CCTK_ATTRIBUTE_UNUSED = ksub(zL,ToReal(zorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va1 = kneg(ymoved);
+    CCTK_REAL_VEC va1 CCTK_ATTRIBUTE_UNUSED = kneg(ymoved);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va2 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC va2 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va3 = ToReal(0);
+    CCTK_REAL_VEC va3 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb1 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC vb1 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb2 = ymoved;
+    CCTK_REAL_VEC vb2 CCTK_ATTRIBUTE_UNUSED = ymoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb3 = zmoved;
+    CCTK_REAL_VEC vb3 CCTK_ATTRIBUTE_UNUSED = zmoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc1 = 
+    CCTK_REAL_VEC vc1 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv11,va2,kmul(gInv12,va1)),kmadd(vb1,kmsub(gInv12,va3,kmul(gInv13,va2)),kmul(vb2,kmsub(gInv13,va1,kmul(gInv11,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc2 = 
+    CCTK_REAL_VEC vc2 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv21,va2,kmul(gInv22,va1)),kmadd(vb1,kmsub(gInv22,va3,kmul(gInv23,va2)),kmul(vb2,kmsub(gInv23,va1,kmul(gInv21,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc3 = 
+    CCTK_REAL_VEC vc3 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv31,va2,kmul(gInv32,va1)),kmadd(vb1,kmsub(gInv32,va3,kmul(gInv33,va2)),kmul(vb2,kmsub(gInv33,va1,kmul(gInv31,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa1 = va1;
+    CCTK_REAL_VEC wa1 CCTK_ATTRIBUTE_UNUSED = va1;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa2 = va2;
+    CCTK_REAL_VEC wa2 CCTK_ATTRIBUTE_UNUSED = va2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa3 = va3;
+    CCTK_REAL_VEC wa3 CCTK_ATTRIBUTE_UNUSED = va3;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega11 = 
+    CCTK_REAL_VEC omega11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wa1,wa1),kmadd(gyyL,kmul(wa2,wa2),kmadd(gzzL,kmul(wa3,wa3),kmul(kmadd(gyzL,kmul(wa2,wa3),kmul(wa1,kmadd(gxyL,wa2,kmul(gxzL,wa3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea1 = kdiv(wa1,ksqrt(omega11));
+    CCTK_REAL_VEC ea1 CCTK_ATTRIBUTE_UNUSED = kdiv(wa1,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea2 = kdiv(wa2,ksqrt(omega11));
+    CCTK_REAL_VEC ea2 CCTK_ATTRIBUTE_UNUSED = kdiv(wa2,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea3 = kdiv(wa3,ksqrt(omega11));
+    CCTK_REAL_VEC ea3 CCTK_ATTRIBUTE_UNUSED = kdiv(wa3,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega12 = 
+    CCTK_REAL_VEC omega12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vb1,kmadd(gxyL,vb2,kmul(gxzL,vb3))),kmadd(ea2,kmadd(gxyL,vb1,kmadd(gyyL,vb2,kmul(gyzL,vb3))),kmul(ea3,kmadd(gxzL,vb1,kmadd(gyzL,vb2,kmul(gzzL,vb3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb1 = knmsub(ea1,omega12,vb1);
+    CCTK_REAL_VEC wb1 CCTK_ATTRIBUTE_UNUSED = knmsub(ea1,omega12,vb1);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb2 = knmsub(ea2,omega12,vb2);
+    CCTK_REAL_VEC wb2 CCTK_ATTRIBUTE_UNUSED = knmsub(ea2,omega12,vb2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb3 = knmsub(ea3,omega12,vb3);
+    CCTK_REAL_VEC wb3 CCTK_ATTRIBUTE_UNUSED = knmsub(ea3,omega12,vb3);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega22 = 
+    CCTK_REAL_VEC omega22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wb1,wb1),kmadd(gyyL,kmul(wb2,wb2),kmadd(gzzL,kmul(wb3,wb3),kmul(kmadd(gyzL,kmul(wb2,wb3),kmul(wb1,kmadd(gxyL,wb2,kmul(gxzL,wb3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb1 = kdiv(wb1,ksqrt(omega22));
+    CCTK_REAL_VEC eb1 CCTK_ATTRIBUTE_UNUSED = kdiv(wb1,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb2 = kdiv(wb2,ksqrt(omega22));
+    CCTK_REAL_VEC eb2 CCTK_ATTRIBUTE_UNUSED = kdiv(wb2,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb3 = kdiv(wb3,ksqrt(omega22));
+    CCTK_REAL_VEC eb3 CCTK_ATTRIBUTE_UNUSED = kdiv(wb3,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega13 = 
+    CCTK_REAL_VEC omega13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(ea2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(ea3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega23 = 
+    CCTK_REAL_VEC omega23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(eb1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(eb2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(eb3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc1 = 
+    CCTK_REAL_VEC wc1 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc1,kmadd(eb1,omega23,kmul(ea1,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc2 = 
+    CCTK_REAL_VEC wc2 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc2,kmadd(eb2,omega23,kmul(ea2,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc3 = 
+    CCTK_REAL_VEC wc3 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc3,kmadd(eb3,omega23,kmul(ea3,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega33 = 
+    CCTK_REAL_VEC omega33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wc1,wc1),kmadd(gyyL,kmul(wc2,wc2),kmadd(gzzL,kmul(wc3,wc3),kmul(kmadd(gyzL,kmul(wc2,wc3),kmul(wc1,kmadd(gxyL,wc2,kmul(gxzL,wc3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec1 = kdiv(wc1,ksqrt(omega33));
+    CCTK_REAL_VEC ec1 CCTK_ATTRIBUTE_UNUSED = kdiv(wc1,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec2 = kdiv(wc2,ksqrt(omega33));
+    CCTK_REAL_VEC ec2 CCTK_ATTRIBUTE_UNUSED = kdiv(wc2,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec3 = kdiv(wc3,ksqrt(omega33));
+    CCTK_REAL_VEC ec3 CCTK_ATTRIBUTE_UNUSED = kdiv(wc3,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED isqrt2 = 
+    CCTK_REAL_VEC isqrt2 CCTK_ATTRIBUTE_UNUSED = 
       ToReal(0.707106781186547524);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet1 = kmul(eb1,isqrt2);
+    CCTK_REAL_VEC ltet1 CCTK_ATTRIBUTE_UNUSED = kmul(eb1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet2 = kmul(eb2,isqrt2);
+    CCTK_REAL_VEC ltet2 CCTK_ATTRIBUTE_UNUSED = kmul(eb2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet3 = kmul(eb3,isqrt2);
+    CCTK_REAL_VEC ltet3 CCTK_ATTRIBUTE_UNUSED = kmul(eb3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n1 = kneg(kmul(eb1,isqrt2));
+    CCTK_REAL_VEC n1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n2 = kneg(kmul(eb2,isqrt2));
+    CCTK_REAL_VEC n2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n3 = kneg(kmul(eb3,isqrt2));
+    CCTK_REAL_VEC n3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rm1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rm2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rm3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im1 = kmul(ea1,isqrt2);
+    CCTK_REAL_VEC im1 CCTK_ATTRIBUTE_UNUSED = kmul(ea1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im2 = kmul(ea2,isqrt2);
+    CCTK_REAL_VEC im2 CCTK_ATTRIBUTE_UNUSED = kmul(ea2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im3 = kmul(ea3,isqrt2);
+    CCTK_REAL_VEC im3 CCTK_ATTRIBUTE_UNUSED = kmul(ea3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rmbar1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rmbar2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rmbar3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar1 = kneg(kmul(ea1,isqrt2));
+    CCTK_REAL_VEC imbar1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar2 = kneg(kmul(ea2,isqrt2));
+    CCTK_REAL_VEC imbar2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar3 = kneg(kmul(ea3,isqrt2));
+    CCTK_REAL_VEC imbar3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED nn = isqrt2;
+    CCTK_REAL_VEC nn CCTK_ATTRIBUTE_UNUSED = isqrt2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1212 = 
+    CCTK_REAL_VEC R1212 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th12gxy,kadd(JacPDstandard4th21gxy,kmadd(kmadd(gamma122,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma222,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma322))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma221,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(gamma321,kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321)))))),ToReal(2),JacPDstandard4th22gxx),JacPDstandard4th11gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1213 = 
+    CCTK_REAL_VEC R1213 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th12gxz,kadd(JacPDstandard4th31gxy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma232,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma221,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma321,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard4th23gxx),JacPDstandard4th11gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1223 = 
+    CCTK_REAL_VEC R1223 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th22gxz,kadd(JacPDstandard4th31gyy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma232,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma122,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma222,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma322,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard4th23gxy),JacPDstandard4th12gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1313 = 
+    CCTK_REAL_VEC R1313 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th13gxz,kadd(JacPDstandard4th31gxz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma233,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma131,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma231,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma331,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard4th33gxx),JacPDstandard4th11gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1323 = 
+    CCTK_REAL_VEC R1323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th23gxz,kadd(JacPDstandard4th31gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma233,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma232,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331))),gamma332))),ToReal(2),JacPDstandard4th33gxy),JacPDstandard4th12gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R2323 = 
+    CCTK_REAL_VEC R2323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard4th23gyz,kadd(JacPDstandard4th32gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma122,kmadd(gxyL,gamma222,kmul(gxzL,gamma322))),kmadd(gamma233,kmadd(gxyL,gamma122,kmadd(gyyL,gamma222,kmul(gyzL,gamma322))),kmul(kmadd(gxzL,gamma122,kmadd(gyzL,gamma222,kmul(gzzL,gamma322))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma132,kmadd(gxyL,gamma232,kmul(gxzL,gamma332))),kmadd(gamma232,kmadd(gxyL,gamma132,kmadd(gyyL,gamma232,kmul(gyzL,gamma332))),kmul(gamma332,kmadd(gxzL,gamma132,kmadd(gyzL,gamma232,kmul(gzzL,gamma332)))))),ToReal(2),JacPDstandard4th33gyy),JacPDstandard4th22gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1212 = 
+    CCTK_REAL_VEC R4p1212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1213 = 
+    CCTK_REAL_VEC R4p1213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1223 = 
+    CCTK_REAL_VEC R4p1223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kyzL,knmsub(kxzL,kyyL,R1223));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1313 = 
+    CCTK_REAL_VEC R4p1313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1323 = 
+    CCTK_REAL_VEC R4p1323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p2323 = 
+    CCTK_REAL_VEC R4p2323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro111 = ToReal(0);
+    CCTK_REAL_VEC Ro111 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro112 = 
+    CCTK_REAL_VEC Ro112 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma121,kmadd(kxzL,gamma321,kadd(JacPDstandard4th1kxy,knmsub(kyyL,gamma211,knmsub(kyzL,gamma311,kmsub(kxyL,ksub(gamma221,gamma111),JacPDstandard4th2kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro113 = 
+    CCTK_REAL_VEC Ro113 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma131,kmadd(kxyL,gamma231,kadd(JacPDstandard4th1kxz,knmsub(kyzL,gamma211,knmsub(kzzL,gamma311,kmsub(kxzL,ksub(gamma331,gamma111),JacPDstandard4th3kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro121 = 
+    CCTK_REAL_VEC Ro121 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma211,kmadd(kyzL,gamma311,kadd(JacPDstandard4th2kxx,knmsub(kxxL,gamma121,knmsub(kxzL,gamma321,kmsub(kxyL,ksub(gamma111,gamma221),JacPDstandard4th1kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro122 = ToReal(0);
+    CCTK_REAL_VEC Ro122 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro123 = 
+    CCTK_REAL_VEC Ro123 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma131,kmadd(kyyL,gamma231,kadd(JacPDstandard4th2kxz,knmsub(kxzL,gamma121,knmsub(kzzL,gamma321,kmsub(kyzL,ksub(gamma331,gamma221),JacPDstandard4th3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro131 = 
+    CCTK_REAL_VEC Ro131 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma211,kmadd(kzzL,gamma311,kadd(JacPDstandard4th3kxx,knmsub(kxxL,gamma131,knmsub(kxyL,gamma231,kmsub(kxzL,ksub(gamma111,gamma331),JacPDstandard4th1kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro132 = 
+    CCTK_REAL_VEC Ro132 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma121,kmadd(kzzL,gamma321,kadd(JacPDstandard4th3kxy,knmsub(kxyL,gamma131,knmsub(kyyL,gamma231,kmsub(kyzL,ksub(gamma221,gamma331),JacPDstandard4th2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro133 = ToReal(0);
+    CCTK_REAL_VEC Ro133 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro211 = ToReal(0);
+    CCTK_REAL_VEC Ro211 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro212 = 
+    CCTK_REAL_VEC Ro212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma122,kmadd(kxzL,gamma322,kadd(JacPDstandard4th1kyy,knmsub(kyyL,gamma221,knmsub(kyzL,gamma321,kmsub(kxyL,ksub(gamma222,gamma121),JacPDstandard4th2kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro213 = 
+    CCTK_REAL_VEC Ro213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxyL,gamma232,kadd(JacPDstandard4th1kyz,knmsub(kyzL,gamma221,knmsub(kzzL,gamma321,kmsub(kxzL,ksub(gamma332,gamma121),JacPDstandard4th3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro221 = 
+    CCTK_REAL_VEC Ro221 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma221,kmadd(kyzL,gamma321,kadd(JacPDstandard4th2kxy,knmsub(kxxL,gamma122,knmsub(kxzL,gamma322,kmsub(kxyL,ksub(gamma121,gamma222),JacPDstandard4th1kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro222 = ToReal(0);
+    CCTK_REAL_VEC Ro222 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro223 = 
+    CCTK_REAL_VEC Ro223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma132,kmadd(kyyL,gamma232,kadd(JacPDstandard4th2kyz,knmsub(kxzL,gamma122,knmsub(kzzL,gamma322,kmsub(kyzL,ksub(gamma332,gamma222),JacPDstandard4th3kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro231 = 
+    CCTK_REAL_VEC Ro231 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma221,kmadd(kzzL,gamma321,kadd(JacPDstandard4th3kxy,knmsub(kxxL,gamma132,knmsub(kxyL,gamma232,kmsub(kxzL,ksub(gamma121,gamma332),JacPDstandard4th1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro232 = 
+    CCTK_REAL_VEC Ro232 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma122,kmadd(kzzL,gamma322,kadd(JacPDstandard4th3kyy,knmsub(kxyL,gamma132,knmsub(kyyL,gamma232,kmsub(kyzL,ksub(gamma222,gamma332),JacPDstandard4th2kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro233 = ToReal(0);
+    CCTK_REAL_VEC Ro233 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro311 = ToReal(0);
+    CCTK_REAL_VEC Ro311 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro312 = 
+    CCTK_REAL_VEC Ro312 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxzL,gamma332,kadd(JacPDstandard4th1kyz,knmsub(kyyL,gamma231,knmsub(kyzL,gamma331,kmsub(kxyL,ksub(gamma232,gamma131),JacPDstandard4th2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro313 = 
+    CCTK_REAL_VEC Ro313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma133,kmadd(kxyL,gamma233,kadd(JacPDstandard4th1kzz,knmsub(kyzL,gamma231,knmsub(kzzL,gamma331,kmsub(kxzL,ksub(gamma333,gamma131),JacPDstandard4th3kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro321 = 
+    CCTK_REAL_VEC Ro321 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma231,kmadd(kyzL,gamma331,kadd(JacPDstandard4th2kxz,knmsub(kxxL,gamma132,knmsub(kxzL,gamma332,kmsub(kxyL,ksub(gamma131,gamma232),JacPDstandard4th1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro322 = ToReal(0);
+    CCTK_REAL_VEC Ro322 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro323 = 
+    CCTK_REAL_VEC Ro323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma133,kmadd(kyyL,gamma233,kadd(JacPDstandard4th2kzz,knmsub(kxzL,gamma132,knmsub(kzzL,gamma332,kmsub(kyzL,ksub(gamma333,gamma232),JacPDstandard4th3kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro331 = 
+    CCTK_REAL_VEC Ro331 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma231,kmadd(kzzL,gamma331,kadd(JacPDstandard4th3kxz,knmsub(kxxL,gamma133,knmsub(kxyL,gamma233,kmsub(kxzL,ksub(gamma131,gamma333),JacPDstandard4th1kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro332 = 
+    CCTK_REAL_VEC Ro332 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma132,kmadd(kzzL,gamma332,kadd(JacPDstandard4th3kyz,knmsub(kxyL,gamma133,knmsub(kyyL,gamma233,kmsub(kyzL,ksub(gamma232,gamma333),JacPDstandard4th2kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro333 = ToReal(0);
+    CCTK_REAL_VEC Ro333 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo11 = 
+    CCTK_REAL_VEC Rojo11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv23,gInv32),kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv22,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo12 = 
+    CCTK_REAL_VEC Rojo12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv23,R1223,knmsub(gInv21,R1212,knmsub(gInv31,R1213,kmadd(gInv12,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv32,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo13 = 
+    CCTK_REAL_VEC Rojo13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv23),kmadd(gInv13,kmul(kxzL,kxzL),knmsub(gInv21,R1213,knmsub(gInv31,R1313,knmsub(gInv32,R1323,kmadd(gInv12,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv23,kmul(kxxL,gInv13))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo21 = 
+    CCTK_REAL_VEC Rojo21 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv32,R1223,knmsub(gInv12,R1212,knmsub(gInv13,R1213,kmadd(gInv21,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv23,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo22 = 
+    CCTK_REAL_VEC Rojo22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv13,gInv31),kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmadd(gInv11,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo23 = 
+    CCTK_REAL_VEC Rojo23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv12,R1223,knmsub(gInv31,R1323,knmsub(gInv32,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv21,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv23,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo31 = 
+    CCTK_REAL_VEC Rojo31 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv32),kmadd(gInv31,kmul(kxzL,kxzL),knmsub(gInv12,R1213,knmsub(gInv13,R1313,knmsub(gInv23,R1323,kmadd(gInv21,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv32,kmul(kxxL,gInv31))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo32 = 
+    CCTK_REAL_VEC Rojo32 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv21,R1223,knmsub(gInv13,R1323,knmsub(gInv23,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv12,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv32,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo33 = 
+    CCTK_REAL_VEC Rojo33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv12,gInv21),kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)),kmadd(gInv11,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)),kmul(gInv22,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4rL = 
+    CCTK_REAL_VEC Psi4rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2)))))),kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),knmsub(kmul(nn,nn),kmadd(imbar1,kmadd(imbar2,kadd(Rojo12,Rojo21),kmul(imbar3,kadd(Rojo13,Rojo31))),knmsub(rmbar1,kmadd(rmbar2,kadd(Rojo12,Rojo21),kmul(rmbar3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo32,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo11,kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(Rojo22,kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),kmul(Rojo33,kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3))))))))),kmsub(kmadd(kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmsub(imbar1,imbar2,kmul(rmbar1,rmbar2)),kmadd(kmadd(n1,kmul(n2,R4p1213),kmadd(n1,kmul(n3,R4p1313),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2))))),kmsub(imbar1,imbar3,kmul(rmbar1,rmbar3)),kmadd(kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmul(nn,kmadd(kmadd(n1,Ro112,kmadd(n2,Ro122,kmul(n3,Ro132))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro211,kmadd(n2,Ro221,kmul(n3,Ro231))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro113,kmadd(n2,Ro123,kmul(n3,Ro133))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro311,kmadd(n2,Ro321,kmul(n3,Ro331))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro213,kmadd(n2,Ro223,kmul(n3,Ro233))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro312,kmadd(n2,Ro322,kmul(n3,Ro332))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131))),kmsub(rmbar1,rmbar1,kmul(imbar1,imbar1)),kmadd(kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232))),kmsub(rmbar2,rmbar2,kmul(imbar2,imbar2)),kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),kmsub(rmbar3,rmbar3,kmul(imbar3,imbar3))))))))))))))),ToReal(2),kmadd(kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3)),kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4iL = 
+    CCTK_REAL_VEC Psi4iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kmadd(n2,R4p1213,kmul(n3,R4p1313)),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2)))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmul(nn,kmadd(kmadd(im1,kmul(rm1,kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131)))),kmul(im2,kmul(rm2,kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232)))))),ToReal(-2),kmsub(im3,kmul(rm3,kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),ToReal(-2))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(n1,kadd(Ro211,Ro112),kmadd(n3,kadd(Ro231,Ro132),kmul(n2,kadd(Ro221,Ro122)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(n1,kadd(Ro312,Ro213),kmadd(n3,kadd(Ro332,Ro233),kmul(n2,kadd(Ro322,Ro223)))),kmul(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kadd(Ro311,Ro113),kmadd(n3,kadd(Ro331,Ro133),kmul(n2,kadd(Ro321,Ro123)))))))))))),ToReal(2),kmsub(ToReal(-2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2))))))),kmul(im3,kmul(rm3,kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi3rL = 
+    CCTK_REAL_VEC Psi3rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(kmadd(rm1,Rojo11,kmadd(rm2,Rojo12,kmul(rm3,Rojo13))),ksub(n1,ltet1),kmadd(kmadd(rm1,Rojo21,kmadd(rm2,Rojo22,kmul(rm3,Rojo23))),ksub(n2,ltet2),kmul(kmadd(rm1,Rojo31,kmadd(rm2,Rojo32,kmul(rm3,Rojo33))),ksub(n3,ltet3)))),kmadd(n3,kmadd(ltet1,kmadd(n2,kmul(R4p1213,rm1),kmadd(n3,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1223,rm2),kmul(n3,kmul(R4p1323,rm2))))),kmadd(nn,kmul(rm2,kmul(Ro223,kmadd(ltet2,ToReal(-2),n2))),kmadd(nn,kmul(rm3,kmul(Ro333,kmadd(ltet3,ToReal(-2),n3))),knmsub(ltet3,kmadd(n1,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1323,rm1),kmadd(n1,kmul(R4p1323,rm2),kmul(n2,kmul(R4p2323,rm2))))),kmadd(ltet2,kmsub(n3,kmadd(R4p1323,rm1,kmul(R4p2323,rm2)),kmul(n1,kmadd(R4p1213,rm1,kmul(R4p1223,rm2)))),kmadd(nn,kmul(Ro313,kmsub(rm1,ksub(n3,ltet3),kmul(ltet1,rm3))),kmadd(nn,kmul(Ro323,kmsub(rm2,ksub(n3,ltet3),kmul(ltet2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro113,kmadd(ltet1,ToReal(-2),n1)),kmadd(Ro123,kmadd(ltet2,rm1,kmul(rm2,ksub(ltet1,n1))),kmadd(Ro133,kmadd(ltet3,rm1,kmul(rm3,ksub(ltet1,n1))),kmadd(Ro233,kmadd(ltet3,rm2,kmul(rm3,ksub(ltet2,n2))),kmul(Ro213,kmadd(ltet1,rm2,kmul(rm1,ksub(ltet2,n2)))))))))))))))),kmadd(n1,kmadd(ltet3,kmadd(n1,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1223,rm2),kmadd(n1,kmul(R4p1313,rm3),kmul(n2,kmul(R4p1323,rm3))))),kmadd(nn,kmul(rm2,kmul(Ro221,kmadd(ltet2,ToReal(-2),n2))),kmadd(nn,kmul(rm3,kmul(Ro331,kmadd(ltet3,ToReal(-2),n3))),knmsub(ltet1,kmadd(n2,kmul(R4p1212,rm2),kmadd(n3,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1213,rm3),kmul(n3,kmul(R4p1313,rm3))))),kmadd(ltet2,kmsub(n1,kmadd(R4p1212,rm2,kmul(R4p1213,rm3)),kmul(n3,kmadd(R4p1223,rm2,kmul(R4p1323,rm3)))),kmadd(nn,kmsub(Ro121,kmsub(rm2,ksub(n1,ltet1),kmul(ltet2,rm1)),kmul(Ro231,kmadd(ltet3,rm2,kmul(rm3,ksub(ltet2,n2))))),kmadd(nn,kmsub(Ro131,kmsub(rm3,ksub(n1,ltet1),kmul(ltet3,rm1)),kmul(Ro311,kmadd(ltet1,rm3,kmul(rm1,ksub(ltet3,n3))))),kmul(nn,kmsub(rm1,kmul(Ro111,kmadd(ltet1,ToReal(-2),n1)),kmadd(Ro321,kmadd(ltet2,rm3,kmul(rm2,ksub(ltet3,n3))),kmul(Ro211,kmadd(ltet1,rm2,kmul(rm1,ksub(ltet2,n2)))))))))))))),kmul(n2,kmadd(ltet3,kmadd(n1,kmul(R4p1323,rm3),kmsub(n2,kmul(R4p2323,rm3),kmul(rm1,kmadd(n2,R4p1223,kmul(n1,R4p1213))))),kmadd(ltet1,kmsub(kmadd(n2,R4p1212,kmul(n3,R4p1213)),rm1,kmul(rm3,kmadd(n3,R4p1323,kmul(n2,R4p1223)))),kmadd(ltet2,kmadd(rm1,kmsub(n3,R4p1223,kmul(n1,R4p1212)),kmul(rm3,kmsub(n1,R4p1223,kmul(n3,R4p2323)))),kmul(nn,kmadd(rm1,kmul(Ro112,kmadd(ltet1,ToReal(-2),n1)),kmadd(rm2,kmul(Ro222,kmadd(ltet2,ToReal(-2),n2)),kmadd(rm3,kmul(Ro332,kmadd(ltet3,ToReal(-2),n3)),kmadd(Ro212,kmsub(rm1,ksub(n2,ltet2),kmul(ltet1,rm2)),kmsub(Ro232,kmsub(rm3,ksub(n2,ltet2),kmul(ltet3,rm2)),kmadd(Ro122,kmadd(ltet2,rm1,kmul(rm2,ksub(ltet1,n1))),kmadd(Ro132,kmadd(ltet3,rm1,kmul(rm3,ksub(ltet1,n1))),kmadd(Ro322,kmadd(ltet2,rm3,kmul(rm2,ksub(ltet3,n3))),kmul(Ro312,kmadd(ltet1,rm3,kmul(rm1,ksub(ltet3,n3))))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi3iL = 
+    CCTK_REAL_VEC Psi3iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmul(nn,nn),kmadd(kmadd(im1,Rojo11,kmadd(im2,Rojo12,kmul(im3,Rojo13))),ksub(n1,ltet1),kmadd(kmadd(im1,Rojo21,kmadd(im2,Rojo22,kmul(im3,Rojo23))),ksub(n2,ltet2),kmul(kmadd(im1,Rojo31,kmadd(im2,Rojo32,kmul(im3,Rojo33))),ksub(n3,ltet3)))),kmadd(n1,kmul(nn,kmul(Ro121,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n2,kmul(nn,kmul(Ro122,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n3,kmul(nn,kmul(Ro123,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n1,kmul(nn,kmul(Ro131,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n2,kmul(nn,kmul(Ro132,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n3,kmul(nn,kmul(Ro133,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n1,kmul(nn,kmul(Ro211,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n2,kmul(nn,kmul(Ro212,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n3,kmul(nn,kmul(Ro213,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n1,kmul(nn,kmul(Ro231,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n2,kmul(nn,kmul(Ro232,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n3,kmul(nn,kmul(Ro233,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n1,kmul(nn,kmul(Ro311,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n2,kmul(nn,kmul(Ro312,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n3,kmul(nn,kmul(Ro313,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n1,kmul(nn,kmul(Ro321,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(n2,kmul(nn,kmul(Ro322,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(n3,kmul(nn,kmul(Ro323,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(im2,kmul(n1,kmul(nn,kmul(Ro221,kmsub(ltet2,ToReal(2),n2)))),kmadd(im2,kmul(n2,kmul(nn,kmul(Ro222,kmsub(ltet2,ToReal(2),n2)))),kmadd(im2,kmul(n3,kmul(nn,kmul(Ro223,kmsub(ltet2,ToReal(2),n2)))),kmadd(im3,kmul(n1,kmul(nn,kmul(Ro331,kmsub(ltet3,ToReal(2),n3)))),kmadd(im3,kmul(n2,kmul(nn,kmul(Ro332,kmsub(ltet3,ToReal(2),n3)))),kmadd(im3,kmul(n3,kmul(nn,kmul(Ro333,kmsub(ltet3,ToReal(2),n3)))),kmadd(n1,knmsub(im2,kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3))))),kmsub(im1,kmul(nn,kmul(Ro111,kmsub(ltet1,ToReal(2),n1))),kmul(im3,kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)))))))),kmadd(n2,kmsub(im1,kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmadd(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3)),kmul(nn,kmul(Ro112,kmsub(ltet1,ToReal(2),n1)))))),kmul(im3,kmadd(R4p1223,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1323,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p2323,kmsub(ltet3,n2,kmul(ltet2,n3))))))),kmul(n3,kmsub(im1,kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmadd(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)),kmul(nn,kmul(Ro113,kmsub(ltet1,ToReal(2),n1)))))),kmul(im2,kmadd(R4p1223,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1323,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p2323,kmsub(ltet2,n3,kmul(ltet3,n2)))))))))))))))))))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi2rL = 
+    CCTK_REAL_VEC Psi2rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(ltet2,kmul(n2,R4p1212),kmadd(ltet3,kmul(n2,R4p1213),kmadd(ltet2,kmul(n3,R4p1213),kmul(ltet3,kmul(n3,R4p1313))))),kmadd(im1,im1,kmul(rm1,rm1)),knmsub(kmadd(ltet1,kmul(n1,R4p1313),kmadd(ltet2,kmul(n1,R4p1323),kmadd(ltet1,kmul(n2,R4p1323),kmul(ltet2,kmul(n2,R4p2323))))),kmadd(im3,im3,kmul(rm3,rm3)),knmsub(kmul(nn,nn),kmadd(im2,kmul(im3,Rojo23),kmadd(rm2,kmul(rm3,Rojo23),kmadd(im1,kmadd(im2,kadd(Rojo12,Rojo21),kmul(im3,kadd(Rojo13,Rojo31))),kmadd(rm1,kmadd(rm2,kadd(Rojo12,Rojo21),kmul(rm3,kadd(Rojo13,Rojo31))),kmadd(im2,kmul(im3,Rojo32),kmadd(rm2,kmul(rm3,Rojo32),kmadd(Rojo11,kmul(im1,im1),kmadd(Rojo22,kmul(im2,im2),kmadd(Rojo33,kmul(im3,im3),kmadd(Rojo11,kmul(rm1,rm1),kmadd(Rojo22,kmul(rm2,rm2),kmul(Rojo33,kmul(rm3,rm3))))))))))))),knmsub(kmadd(im2,im2,kmul(rm2,rm2)),kmadd(n3,kmsub(ltet3,R4p2323,kmul(ltet1,R4p1223)),kmul(n1,kmsub(ltet1,R4p1212,kmul(ltet3,R4p1223)))),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmadd(ltet2,kmul(n3,R4p2323),kmadd(ltet3,kmadd(n1,R4p1323,kmul(n2,R4p2323)),kmsub(ltet1,kmsub(n3,R4p1323,kmadd(n2,R4p1223,kmul(n1,R4p1213))),kmul(n1,kmadd(ltet2,R4p1223,kmul(ltet1,R4p1213)))))),kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmadd(ltet1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmadd(ltet3,kmadd(n1,R4p1213,kmsub(n3,kmul(R4p1323,ToReal(-2)),kmul(n2,R4p1223))),kmul(ltet2,kmsub(n1,R4p1212,kmul(n3,R4p1223))))),kmadd(nn,kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmul(Ro211,ksub(n1,ltet1)),kmadd(kmadd(im1,im3,kmul(rm1,rm3)),kmul(Ro311,ksub(n1,ltet1)),kmadd(Ro111,kmul(kmadd(im1,im1,kmul(rm1,rm1)),ksub(n1,ltet1)),kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmul(Ro122,ksub(n2,ltet2)),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmul(Ro322,ksub(n2,ltet2)),kmadd(Ro222,kmul(kmadd(im2,im2,kmul(rm2,rm2)),ksub(n2,ltet2)),kmadd(kmadd(im1,im3,kmul(rm1,rm3)),kmul(Ro133,ksub(n3,ltet3)),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmul(Ro233,ksub(n3,ltet3)),kmadd(Ro333,kmul(kmadd(im3,im3,kmul(rm3,rm3)),ksub(n3,ltet3)),kmadd(Ro112,kmsub(n2,kmadd(im1,im1,kmul(rm1,rm1)),kmul(ltet1,kmadd(im1,im2,kmul(rm1,rm2)))),kmadd(Ro221,kmsub(n1,kmadd(im2,im2,kmul(rm2,rm2)),kmul(ltet2,kmadd(im1,im2,kmul(rm1,rm2)))),kmadd(Ro113,kmsub(n3,kmadd(im1,im1,kmul(rm1,rm1)),kmul(ltet1,kmadd(im1,im3,kmul(rm1,rm3)))),kmadd(Ro331,kmsub(n1,kmadd(im3,im3,kmul(rm3,rm3)),kmul(ltet3,kmadd(im1,im3,kmul(rm1,rm3)))),kmadd(Ro223,kmsub(n3,kmadd(im2,im2,kmul(rm2,rm2)),kmul(ltet2,kmadd(im2,im3,kmul(rm2,rm3)))),kmadd(Ro332,kmsub(n2,kmadd(im3,im3,kmul(rm3,rm3)),kmul(ltet3,kmadd(im2,im3,kmul(rm2,rm3)))),kmadd(Ro121,kmsub(n1,kmadd(im1,im2,kmul(rm1,rm2)),kmul(ltet2,kmadd(im1,im1,kmul(rm1,rm1)))),kmadd(Ro131,kmsub(n1,kmadd(im1,im3,kmul(rm1,rm3)),kmul(ltet3,kmadd(im1,im1,kmul(rm1,rm1)))),kmadd(Ro212,kmsub(n2,kmadd(im1,im2,kmul(rm1,rm2)),kmul(ltet1,kmadd(im2,im2,kmul(rm2,rm2)))),kmadd(Ro232,kmsub(n2,kmadd(im2,im3,kmul(rm2,rm3)),kmul(ltet3,kmadd(im2,im2,kmul(rm2,rm2)))),kmadd(Ro313,kmsub(n3,kmadd(im1,im3,kmul(rm1,rm3)),kmul(ltet1,kmadd(im3,im3,kmul(rm3,rm3)))),kmadd(Ro323,kmsub(n3,kmadd(im2,im3,kmul(rm2,rm3)),kmul(ltet2,kmadd(im3,im3,kmul(rm3,rm3)))),kmadd(Ro321,kmadd(im3,kmsub(im2,n1,kmul(im1,ltet2)),kmul(rm3,kmsub(n1,rm2,kmul(ltet2,rm1)))),kmadd(Ro231,kmadd(im2,kmsub(im3,n1,kmul(im1,ltet3)),kmul(rm2,kmsub(n1,rm3,kmul(ltet3,rm1)))),kmadd(Ro312,kmadd(im3,kmsub(im1,n2,kmul(im2,ltet1)),kmul(rm3,kmsub(n2,rm1,kmul(ltet1,rm2)))),kmadd(Ro132,kmadd(im1,kmsub(im3,n2,kmul(im2,ltet3)),kmul(rm1,kmsub(n2,rm3,kmul(ltet3,rm2)))),kmadd(Ro213,kmadd(im2,kmsub(im1,n3,kmul(im3,ltet1)),kmul(rm2,kmsub(n3,rm1,kmul(ltet1,rm3)))),kmul(Ro123,kmadd(im1,kmsub(im2,n3,kmul(im3,ltet2)),kmul(rm1,kmsub(n3,rm2,kmul(ltet2,rm3))))))))))))))))))))))))))))))),kmul(kmadd(im1,im3,kmul(rm1,rm3)),kmadd(ltet2,kmul(n1,R4p1213),kmadd(ltet1,kmul(n2,R4p1213),kmadd(ltet3,kmul(n1,R4p1313),kmadd(ltet1,kmul(n3,R4p1313),kmadd(ltet3,kmul(n2,R4p1323),kmadd(ltet2,kmul(n3,R4p1323),kmul(ltet2,kmul(n2,kmul(R4p1223,ToReal(2))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi2iL = 
+    CCTK_REAL_VEC Psi2iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmsub(im3,rm1,kmul(im1,rm3)),kmadd(R4p1213,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1313,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1323,kmsub(ltet2,n3,kmul(ltet3,n2))))),kmadd(kmsub(im2,rm1,kmul(im1,rm2)),kmadd(ltet1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmsub(R4p1223,kmsub(ltet2,n3,kmul(ltet3,n2)),kmul(n1,kmadd(ltet3,R4p1213,kmul(ltet2,R4p1212))))),kmadd(kmsub(im3,rm2,kmul(im2,rm3)),kmadd(ltet1,kmadd(n1,R4p1213,kmul(n2,R4p1223)),kmadd(ltet1,kmul(n3,R4p1323),kmsub(ltet2,kmul(n3,R4p2323),kmadd(n1,kmadd(ltet2,R4p1223,kmul(ltet1,R4p1213)),kmul(ltet3,kmadd(n1,R4p1323,kmul(n2,R4p2323))))))),kmsub(kmul(nn,nn),kmadd(im1,kmadd(rm2,ksub(Rojo21,Rojo12),kmul(rm3,ksub(Rojo31,Rojo13))),kmadd(im2,kmadd(rm1,ksub(Rojo12,Rojo21),kmul(rm3,ksub(Rojo32,Rojo23))),kmul(im3,kmadd(rm1,ksub(Rojo13,Rojo31),kmul(rm2,ksub(Rojo23,Rojo32)))))),kmul(nn,kmadd(im1,kmadd(n2,kmul(rm2,Ro212),kmadd(n3,kmul(rm2,Ro213),kmadd(ltet2,kmul(rm2,Ro221),kmadd(ltet3,kmul(rm2,Ro231),kmadd(n2,kmul(rm3,Ro312),kmadd(n3,kmul(rm3,Ro313),kmadd(ltet2,kmul(rm3,Ro321),kmadd(ltet3,kmul(rm3,Ro331),knmsub(rm2,kmadd(n3,Ro123,kmadd(Ro122,kadd(n2,ltet2),kmul(ltet3,Ro132))),knmsub(rm3,kmadd(ltet2,Ro123,kmadd(Ro133,kadd(n3,ltet3),kmul(n2,Ro132))),kmadd(ltet1,kmadd(rm2,ksub(Ro211,Ro112),kmul(rm3,ksub(Ro311,Ro113))),kmul(n1,kmadd(rm2,ksub(Ro211,Ro121),kmul(rm3,ksub(Ro311,Ro131))))))))))))))),kmadd(im2,kmadd(ltet2,kmul(rm3,Ro322),kmadd(n2,kmul(rm3,Ro322),kmadd(n3,kmul(rm3,Ro323),kmadd(ltet3,kmul(rm3,Ro332),knmsub(rm3,kmadd(ltet2,Ro223,kmadd(Ro233,kadd(n3,ltet3),kmul(n2,Ro232))),kmadd(ltet1,kmadd(rm1,ksub(Ro112,Ro211),kmul(rm3,ksub(Ro312,Ro213))),kmadd(rm1,kmadd(n2,ksub(Ro122,Ro212),kmadd(n3,ksub(Ro123,Ro213),kmadd(ltet2,ksub(Ro122,Ro221),kmul(ltet3,ksub(Ro132,Ro231))))),kmul(n1,kmadd(rm1,ksub(Ro121,Ro211),kmul(rm3,ksub(Ro321,Ro231))))))))))),kmul(im3,kmadd(rm1,kmadd(kadd(ltet3,n3),Ro133,knmsub(n3,Ro313,knmsub(ltet3,Ro331,kmadd(n1,ksub(Ro131,Ro311),kmul(n2,ksub(Ro132,Ro312)))))),kmadd(ltet1,kmadd(rm1,ksub(Ro113,Ro311),kmul(rm2,ksub(Ro213,Ro312))),kmadd(ltet2,kmadd(rm1,ksub(Ro123,Ro321),kmul(rm2,ksub(Ro223,Ro322))),kmul(rm2,kmadd(kadd(ltet3,n3),Ro233,knmsub(n3,Ro323,knmsub(ltet3,Ro332,kmadd(n1,ksub(Ro231,Ro321),kmul(n2,ksub(Ro232,Ro322))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi1rL = 
+    CCTK_REAL_VEC Psi1rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(kmadd(rm1,Rojo11,kmadd(rm2,Rojo12,kmul(rm3,Rojo13))),ksub(ltet1,n1),kmadd(rm1,kmadd(Rojo21,ksub(ltet2,n2),kmul(Rojo31,ksub(ltet3,n3))),kmadd(rm2,kmadd(Rojo22,ksub(ltet2,n2),kmul(Rojo32,ksub(ltet3,n3))),kmul(rm3,kmadd(Rojo23,ksub(ltet2,n2),kmul(Rojo33,ksub(ltet3,n3))))))),kmadd(ltet1,kmadd(ltet1,kmadd(n2,kmul(R4p1212,rm2),kmadd(n3,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1213,rm3),kmul(n3,kmul(R4p1313,rm3))))),kmadd(nn,kmul(rm2,kmul(Ro221,kmadd(n2,ToReal(-2),ltet2))),kmadd(nn,kmul(rm3,kmul(Ro331,kmadd(n3,ToReal(-2),ltet3))),knmsub(ltet3,kmadd(n1,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1223,rm2),kmadd(n1,kmul(R4p1313,rm3),kmul(n2,kmul(R4p1323,rm3))))),kmadd(ltet2,kmsub(n3,kmadd(R4p1223,rm2,kmul(R4p1323,rm3)),kmul(n1,kmadd(R4p1212,rm2,kmul(R4p1213,rm3)))),kmadd(nn,kmul(Ro121,kmsub(rm2,ksub(ltet1,n1),kmul(n2,rm1))),kmadd(nn,kmul(Ro131,kmsub(rm3,ksub(ltet1,n1),kmul(n3,rm1))),kmadd(nn,kmul(Ro211,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2))),kmadd(nn,kmul(Ro311,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3))),kmadd(nn,kmul(Ro321,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro111,kmadd(n1,ToReal(-2),ltet1)),kmul(Ro231,kmadd(n3,rm2,kmul(rm3,ksub(n2,ltet2)))))))))))))))),kmadd(ltet3,kmadd(ltet3,kmadd(n1,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1323,rm1),kmadd(n1,kmul(R4p1323,rm2),kmul(n2,kmul(R4p2323,rm2))))),kmadd(nn,kmul(rm2,kmul(Ro223,kmadd(n2,ToReal(-2),ltet2))),kmadd(nn,kmul(rm3,kmul(Ro333,kmadd(n3,ToReal(-2),ltet3))),knmsub(ltet1,kmadd(n2,kmul(R4p1213,rm1),kmadd(n3,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1223,rm2),kmul(n3,kmul(R4p1323,rm2))))),kmadd(ltet2,kmsub(n1,kmadd(R4p1213,rm1,kmul(R4p1223,rm2)),kmul(n3,kmadd(R4p1323,rm1,kmul(R4p2323,rm2)))),kmadd(nn,kmul(Ro213,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2))),kmadd(nn,kmul(Ro313,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3))),kmadd(nn,kmul(Ro323,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro113,kmadd(n1,ToReal(-2),ltet1)),kmadd(Ro123,kmadd(n2,rm1,kmul(rm2,ksub(n1,ltet1))),kmadd(Ro233,kmadd(n3,rm2,kmul(rm3,ksub(n2,ltet2))),kmul(Ro133,kmadd(n3,rm1,kmul(rm3,ksub(n1,ltet1)))))))))))))))),kmul(ltet2,kmadd(ltet1,kmadd(n2,kmul(R4p1223,rm3),kmsub(n3,kmul(R4p1323,rm3),kmul(rm1,kmadd(n3,R4p1213,kmul(n2,R4p1212))))),kmadd(ltet2,kmadd(rm3,kmsub(n3,R4p2323,kmul(n1,R4p1223)),kmul(rm1,kmsub(n1,R4p1212,kmul(n3,R4p1223)))),kmadd(ltet3,kmsub(kmadd(n1,R4p1213,kmul(n2,R4p1223)),rm1,kmul(rm3,kmadd(n2,R4p2323,kmul(n1,R4p1323)))),kmul(nn,kmadd(rm1,kmul(Ro112,kmadd(n1,ToReal(-2),ltet1)),kmadd(rm2,kmul(Ro222,kmadd(n2,ToReal(-2),ltet2)),kmadd(rm3,kmul(Ro332,kmadd(n3,ToReal(-2),ltet3)),knmsub(Ro122,kmadd(n2,rm1,kmul(rm2,ksub(n1,ltet1))),knmsub(Ro132,kmadd(n3,rm1,kmul(rm3,ksub(n1,ltet1))),kmadd(Ro212,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2)),kmadd(Ro232,kmsub(rm3,ksub(ltet2,n2),kmul(n3,rm2)),kmadd(Ro312,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3)),kmul(Ro322,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3)))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi1iL = 
+    CCTK_REAL_VEC Psi1iL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(im1,kmadd(Rojo11,ksub(ltet1,n1),kmadd(Rojo21,ksub(ltet2,n2),kmul(Rojo31,ksub(ltet3,n3)))),kmadd(im2,kmadd(Rojo12,ksub(ltet1,n1),kmadd(Rojo22,ksub(ltet2,n2),kmul(Rojo32,ksub(ltet3,n3)))),kmul(im3,kmadd(Rojo13,ksub(ltet1,n1),kmadd(Rojo23,ksub(ltet2,n2),kmul(Rojo33,ksub(ltet3,n3))))))),kmadd(ltet1,kmadd(im2,kmadd(nn,kmul(Ro221,kmadd(n2,ToReal(-2),ltet2)),kmadd(R4p1212,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1213,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1223,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmadd(im3,kmadd(nn,kmul(Ro331,kmadd(n3,ToReal(-2),ltet3)),kmadd(R4p1213,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1313,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1323,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmul(nn,kmadd(im1,kmul(Ro111,kmadd(n1,ToReal(-2),ltet1)),knmsub(Ro211,kmadd(im2,n1,kmul(im1,ksub(n2,ltet2))),knmsub(Ro311,kmadd(im3,n1,kmul(im1,ksub(n3,ltet3))),knmsub(Ro321,kmadd(im3,n2,kmul(im2,ksub(n3,ltet3))),kmadd(Ro121,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro131,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmul(Ro231,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)))))))))))),kmadd(ltet2,kmadd(im3,kmadd(nn,kmul(Ro332,kmadd(n3,ToReal(-2),ltet3)),kmadd(R4p1223,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1323,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p2323,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmadd(im1,kmadd(nn,kmul(Ro112,kmadd(n1,ToReal(-2),ltet1)),kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmul(nn,kmadd(im2,kmul(Ro222,kmadd(n2,ToReal(-2),ltet2)),knmsub(Ro312,kmadd(im3,n1,kmul(im1,ksub(n3,ltet3))),knmsub(Ro322,kmadd(im3,n2,kmul(im2,ksub(n3,ltet3))),kmadd(Ro122,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro132,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmadd(Ro212,kmsub(im1,ksub(ltet2,n2),kmul(im2,n1)),kmul(Ro232,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)))))))))))),kmul(ltet3,kmadd(im1,kmadd(nn,kmul(Ro113,kmadd(n1,ToReal(-2),ltet1)),kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmadd(im2,kmadd(nn,kmul(Ro223,kmadd(n2,ToReal(-2),ltet2)),kmadd(R4p1223,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1323,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p2323,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmul(nn,kmadd(im3,kmul(Ro333,kmadd(n3,ToReal(-2),ltet3)),knmsub(Ro213,kmadd(im2,n1,kmul(im1,ksub(n2,ltet2))),kmadd(Ro123,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro133,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmadd(Ro233,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)),kmadd(Ro313,kmsub(im1,ksub(ltet3,n3),kmul(im3,n1)),kmul(Ro323,kmsub(im2,ksub(ltet3,n3),kmul(im3,n2))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi0rL = 
+    CCTK_REAL_VEC Psi0rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet3,ltet3),kmul(ltet1,kmul(ltet3,kmul(R4p1223,ToReal(-2)))))),kmsub(im2,im2,kmul(rm2,rm2)),knmsub(kmul(nn,nn),kmadd(im1,kmadd(im2,kadd(Rojo12,Rojo21),kmul(im3,kadd(Rojo13,Rojo31))),knmsub(rm1,kmadd(rm2,kadd(Rojo12,Rojo21),kmul(rm3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(im2,im3,kmul(rm2,rm3)),kmadd(Rojo32,kmsub(im2,im3,kmul(rm2,rm3)),kmadd(Rojo11,kmsub(im1,im1,kmul(rm1,rm1)),kmadd(Rojo22,kmsub(im2,im2,kmul(rm2,rm2)),kmul(Rojo33,kmsub(im3,im3,kmul(rm3,rm3))))))))),kmsub(kmadd(kmsub(ltet1,kmadd(ltet2,R4p1212,kmul(ltet3,R4p1213)),kmul(ltet3,kmadd(ltet2,R4p1223,kmul(ltet3,R4p1323)))),kmsub(im1,im2,kmul(rm1,rm2)),kmadd(kmadd(ltet1,kmul(ltet2,R4p1213),kmadd(ltet1,kmul(ltet3,R4p1313),kmadd(ltet2,kmul(ltet3,R4p1323),kmul(R4p1223,kmul(ltet2,ltet2))))),kmsub(im1,im3,kmul(rm1,rm3)),kmadd(kmsub(rm2,rm3,kmul(im2,im3)),kmadd(R4p1213,kmul(ltet1,ltet1),kmsub(ltet1,kmsub(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet2,kmul(ltet3,R4p2323)))),kmul(nn,kmadd(kmadd(ltet1,Ro112,kmadd(ltet2,Ro122,kmul(ltet3,Ro132))),kmsub(rm1,rm2,kmul(im1,im2)),kmadd(kmadd(ltet1,Ro211,kmadd(ltet2,Ro221,kmul(ltet3,Ro231))),kmsub(rm1,rm2,kmul(im1,im2)),kmadd(kmadd(ltet1,Ro113,kmadd(ltet2,Ro123,kmul(ltet3,Ro133))),kmsub(rm1,rm3,kmul(im1,im3)),kmadd(kmadd(ltet1,Ro311,kmadd(ltet2,Ro321,kmul(ltet3,Ro331))),kmsub(rm1,rm3,kmul(im1,im3)),kmadd(kmadd(ltet1,Ro213,kmadd(ltet2,Ro223,kmul(ltet3,Ro233))),kmsub(rm2,rm3,kmul(im2,im3)),kmadd(kmadd(ltet1,Ro312,kmadd(ltet2,Ro322,kmul(ltet3,Ro332))),kmsub(rm2,rm3,kmul(im2,im3)),kmadd(kmadd(ltet1,Ro111,kmadd(ltet2,Ro121,kmul(ltet3,Ro131))),kmsub(rm1,rm1,kmul(im1,im1)),kmadd(kmadd(ltet1,Ro212,kmadd(ltet2,Ro222,kmul(ltet3,Ro232))),kmsub(rm2,rm2,kmul(im2,im2)),kmul(kmadd(ltet1,Ro313,kmadd(ltet2,Ro323,kmul(ltet3,Ro333))),kmsub(rm3,rm3,kmul(im3,im3))))))))))))))),ToReal(2),kmadd(kmsub(im3,im3,kmul(rm3,rm3)),kmadd(R4p1313,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet2,ltet2),kmul(ltet1,kmul(ltet2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(im1,im1,kmul(rm1,rm1)),kmadd(R4p1212,kmul(ltet2,ltet2),kmadd(R4p1313,kmul(ltet3,ltet3),kmul(ltet2,kmul(ltet3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi0iL = 
+    CCTK_REAL_VEC Psi0iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmul(kmadd(ltet1,kmadd(ltet2,R4p1213,kmul(ltet3,R4p1313)),kmadd(ltet2,kmul(ltet3,R4p1323),kmul(R4p1223,kmul(ltet2,ltet2)))),ToReal(-2)),kmadd(ToReal(2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet3,ltet3),kmul(ltet1,kmul(ltet3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(ltet3,kmadd(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet1,kmadd(ltet2,R4p1212,kmul(ltet3,R4p1213)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(ltet1,ltet1),kmsub(ltet1,kmsub(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet2,kmul(ltet3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(ltet2,ltet2),kmadd(R4p1313,kmul(ltet3,ltet3),kmul(ltet2,kmul(ltet3,kmul(R4p1213,ToReal(2))))))),kmadd(im3,kmul(rm3,kmadd(R4p1313,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet2,ltet2),kmul(ltet1,kmul(ltet2,kmul(R4p1323,ToReal(2))))))),kmul(nn,kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(ltet1,kadd(Ro112,Ro211),kmadd(ltet2,kadd(Ro122,Ro221),kmul(ltet3,kadd(Ro132,Ro231)))),kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(ltet1,kadd(Ro113,Ro311),kmadd(ltet2,kadd(Ro123,Ro321),kmul(ltet3,kadd(Ro133,Ro331)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(ltet1,kadd(Ro213,Ro312),kmadd(ltet2,kadd(Ro223,Ro322),kmul(ltet3,kadd(Ro233,Ro332)))),kmul(kmadd(im1,kmul(rm1,kmadd(ltet1,Ro111,kmadd(ltet2,Ro121,kmul(ltet3,Ro131)))),kmadd(im2,kmul(rm2,kmadd(ltet1,Ro212,kmadd(ltet2,Ro222,kmul(ltet3,Ro232)))),kmul(im3,kmul(rm3,kmadd(ltet1,Ro313,kmadd(ltet2,Ro323,kmul(ltet3,Ro333))))))),ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/WeylScal4_psis_calc_Nth.cc b/src/WeylScal4_psis_calc_Nth.cc
index a9852ee..b92ce0b 100644
--- a/src/WeylScal4_psis_calc_Nth.cc
+++ b/src/WeylScal4_psis_calc_Nth.cc
@@ -92,13 +92,18 @@ static void WeylScal4_psis_calc_Nth_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
   const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
   const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5);
-  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0);
-  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0);
-  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0);
-  const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0);
-  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi);
-  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi);
-  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi);
+  const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.333333333333333333333333333333);
+  const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(0.666666666666666666666666666667);
+  const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = 
+    ToReal(1.33333333333333333333333333333);
+  const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dxi,ToReal(0.5));
+  const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dyi,ToReal(0.5));
+  const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = 
+    kmul(dzi,ToReal(0.5));
   
   /* Initialize predefined quantities */
   const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx);
@@ -143,9 +148,9 @@ static void WeylScal4_psis_calc_Nth_Body(const cGH* restrict const cctkGH, const
                         && strlen(jacobian_group) > 0;
   const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
   const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
-  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
+  if (use_jacobian && (strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
   }
   
   const CCTK_REAL* restrict jacobian_ptrs[9];
@@ -162,26 +167,6 @@ static void WeylScal4_psis_calc_Nth_Body(const cGH* restrict const cctkGH, const
   const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
   const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
   
-  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
-                                                1, jacobian_determinant_ptrs);
-  
-  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  
-  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
-  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
-                                                9, jacobian_inverse_ptrs);
-  
-  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
-  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
-  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
-  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
-  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
-  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
-  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
-  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
-  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
-  
   const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
@@ -1019,380 +1004,380 @@ static void WeylScal4_psis_calc_Nth_Body(const cGH* restrict const cctkGH, const
       JacPDstandard32gyz = PDstandard23gyz;
     }
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED detg = 
+    CCTK_REAL_VEC detg CCTK_ATTRIBUTE_UNUSED = 
       knmsub(gyyL,kmul(gxzL,gxzL),knmsub(gxxL,kmul(gyzL,gyzL),kmadd(gzzL,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)),kmul(gxyL,kmul(gxzL,kmul(gyzL,ToReal(2)))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED invdetg = kdiv(ToReal(1),detg);
+    CCTK_REAL_VEC invdetg CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(1),detg);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv11 = 
+    CCTK_REAL_VEC gInv11 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gyyL,gzzL,kmul(gyzL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv12 = 
+    CCTK_REAL_VEC gInv12 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv13 = 
+    CCTK_REAL_VEC gInv13 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv21 = 
+    CCTK_REAL_VEC gInv21 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxzL,gyzL,kmul(gxyL,gzzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv22 = 
+    CCTK_REAL_VEC gInv22 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gzzL,kmul(gxzL,gxzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv23 = 
+    CCTK_REAL_VEC gInv23 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv31 = 
+    CCTK_REAL_VEC gInv31 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gyzL,kmul(gxzL,gyyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv32 = 
+    CCTK_REAL_VEC gInv32 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxyL,gxzL,kmul(gxxL,gyzL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gInv33 = 
+    CCTK_REAL_VEC gInv33 CCTK_ATTRIBUTE_UNUSED = 
       kmul(invdetg,kmsub(gxxL,gyyL,kmul(gxyL,gxyL)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma111 = 
+    CCTK_REAL_VEC gamma111 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv11,JacPDstandard1gxx,knmsub(gInv12,JacPDstandard2gxx,kmsub(kmadd(gInv12,JacPDstandard1gxy,kmul(gInv13,JacPDstandard1gxz)),ToReal(2),kmul(gInv13,JacPDstandard3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma211 = 
+    CCTK_REAL_VEC gamma211 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv21,JacPDstandard1gxx,knmsub(gInv22,JacPDstandard2gxx,kmsub(kmadd(gInv22,JacPDstandard1gxy,kmul(gInv23,JacPDstandard1gxz)),ToReal(2),kmul(gInv23,JacPDstandard3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma311 = 
+    CCTK_REAL_VEC gamma311 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv31,JacPDstandard1gxx,knmsub(gInv32,JacPDstandard2gxx,kmsub(kmadd(gInv32,JacPDstandard1gxy,kmul(gInv33,JacPDstandard1gxz)),ToReal(2),kmul(gInv33,JacPDstandard3gxx)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma121 = 
+    CCTK_REAL_VEC gamma121 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv12,JacPDstandard1gyy,kmadd(gInv11,JacPDstandard2gxx,kmul(gInv13,kadd(JacPDstandard1gyz,ksub(JacPDstandard2gxz,JacPDstandard3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma221 = 
+    CCTK_REAL_VEC gamma221 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv22,JacPDstandard1gyy,kmadd(gInv21,JacPDstandard2gxx,kmul(gInv23,kadd(JacPDstandard1gyz,ksub(JacPDstandard2gxz,JacPDstandard3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma321 = 
+    CCTK_REAL_VEC gamma321 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv32,JacPDstandard1gyy,kmadd(gInv31,JacPDstandard2gxx,kmul(gInv33,kadd(JacPDstandard1gyz,ksub(JacPDstandard2gxz,JacPDstandard3gxy))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma131 = 
+    CCTK_REAL_VEC gamma131 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard1gzz,kmadd(gInv11,JacPDstandard3gxx,kmul(gInv12,kadd(JacPDstandard1gyz,ksub(JacPDstandard3gxy,JacPDstandard2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma231 = 
+    CCTK_REAL_VEC gamma231 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard1gzz,kmadd(gInv21,JacPDstandard3gxx,kmul(gInv22,kadd(JacPDstandard1gyz,ksub(JacPDstandard3gxy,JacPDstandard2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma331 = 
+    CCTK_REAL_VEC gamma331 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard1gzz,kmadd(gInv31,JacPDstandard3gxx,kmul(gInv32,kadd(JacPDstandard1gyz,ksub(JacPDstandard3gxy,JacPDstandard2gxz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma122 = 
+    CCTK_REAL_VEC gamma122 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv12,JacPDstandard2gyy,kmadd(gInv11,kmsub(JacPDstandard2gxy,ToReal(2),JacPDstandard1gyy),kmul(gInv13,kmsub(JacPDstandard2gyz,ToReal(2),JacPDstandard3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma222 = 
+    CCTK_REAL_VEC gamma222 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv22,JacPDstandard2gyy,kmadd(gInv21,kmsub(JacPDstandard2gxy,ToReal(2),JacPDstandard1gyy),kmul(gInv23,kmsub(JacPDstandard2gyz,ToReal(2),JacPDstandard3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma322 = 
+    CCTK_REAL_VEC gamma322 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv32,JacPDstandard2gyy,kmadd(gInv31,kmsub(JacPDstandard2gxy,ToReal(2),JacPDstandard1gyy),kmul(gInv33,kmsub(JacPDstandard2gyz,ToReal(2),JacPDstandard3gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma132 = 
+    CCTK_REAL_VEC gamma132 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv13,JacPDstandard2gzz,kmadd(gInv12,JacPDstandard3gyy,kmul(gInv11,kadd(JacPDstandard2gxz,ksub(JacPDstandard3gxy,JacPDstandard1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma232 = 
+    CCTK_REAL_VEC gamma232 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv23,JacPDstandard2gzz,kmadd(gInv22,JacPDstandard3gyy,kmul(gInv21,kadd(JacPDstandard2gxz,ksub(JacPDstandard3gxy,JacPDstandard1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma332 = 
+    CCTK_REAL_VEC gamma332 CCTK_ATTRIBUTE_UNUSED = 
       kmul(kmadd(gInv33,JacPDstandard2gzz,kmadd(gInv32,JacPDstandard3gyy,kmul(gInv31,kadd(JacPDstandard2gxz,ksub(JacPDstandard3gxy,JacPDstandard1gyz))))),ToReal(0.5));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma133 = 
+    CCTK_REAL_VEC gamma133 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv13,JacPDstandard3gzz,kmadd(gInv11,kmsub(JacPDstandard3gxz,ToReal(2),JacPDstandard1gzz),kmul(gInv12,kmsub(JacPDstandard3gyz,ToReal(2),JacPDstandard2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma233 = 
+    CCTK_REAL_VEC gamma233 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv23,JacPDstandard3gzz,kmadd(gInv21,kmsub(JacPDstandard3gxz,ToReal(2),JacPDstandard1gzz),kmul(gInv22,kmsub(JacPDstandard3gyz,ToReal(2),JacPDstandard2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED gamma333 = 
+    CCTK_REAL_VEC gamma333 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kmadd(gInv33,JacPDstandard3gzz,kmadd(gInv31,kmsub(JacPDstandard3gxz,ToReal(2),JacPDstandard1gzz),kmul(gInv32,kmsub(JacPDstandard3gyz,ToReal(2),JacPDstandard2gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED xmoved = ksub(xL,ToReal(xorig));
+    CCTK_REAL_VEC xmoved CCTK_ATTRIBUTE_UNUSED = ksub(xL,ToReal(xorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ymoved = ksub(yL,ToReal(yorig));
+    CCTK_REAL_VEC ymoved CCTK_ATTRIBUTE_UNUSED = ksub(yL,ToReal(yorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED zmoved = ksub(zL,ToReal(zorig));
+    CCTK_REAL_VEC zmoved CCTK_ATTRIBUTE_UNUSED = ksub(zL,ToReal(zorig));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va1 = kneg(ymoved);
+    CCTK_REAL_VEC va1 CCTK_ATTRIBUTE_UNUSED = kneg(ymoved);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va2 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC va2 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED va3 = ToReal(0);
+    CCTK_REAL_VEC va3 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb1 = kadd(xmoved,ToReal(offset));
+    CCTK_REAL_VEC vb1 CCTK_ATTRIBUTE_UNUSED = kadd(xmoved,ToReal(offset));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb2 = ymoved;
+    CCTK_REAL_VEC vb2 CCTK_ATTRIBUTE_UNUSED = ymoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vb3 = zmoved;
+    CCTK_REAL_VEC vb3 CCTK_ATTRIBUTE_UNUSED = zmoved;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc1 = 
+    CCTK_REAL_VEC vc1 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv11,va2,kmul(gInv12,va1)),kmadd(vb1,kmsub(gInv12,va3,kmul(gInv13,va2)),kmul(vb2,kmsub(gInv13,va1,kmul(gInv11,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc2 = 
+    CCTK_REAL_VEC vc2 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv21,va2,kmul(gInv22,va1)),kmadd(vb1,kmsub(gInv22,va3,kmul(gInv23,va2)),kmul(vb2,kmsub(gInv23,va1,kmul(gInv21,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED vc3 = 
+    CCTK_REAL_VEC vc3 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ksqrt(detg),kmadd(vb3,kmsub(gInv31,va2,kmul(gInv32,va1)),kmadd(vb1,kmsub(gInv32,va3,kmul(gInv33,va2)),kmul(vb2,kmsub(gInv33,va1,kmul(gInv31,va3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa1 = va1;
+    CCTK_REAL_VEC wa1 CCTK_ATTRIBUTE_UNUSED = va1;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa2 = va2;
+    CCTK_REAL_VEC wa2 CCTK_ATTRIBUTE_UNUSED = va2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wa3 = va3;
+    CCTK_REAL_VEC wa3 CCTK_ATTRIBUTE_UNUSED = va3;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega11 = 
+    CCTK_REAL_VEC omega11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wa1,wa1),kmadd(gyyL,kmul(wa2,wa2),kmadd(gzzL,kmul(wa3,wa3),kmul(kmadd(gyzL,kmul(wa2,wa3),kmul(wa1,kmadd(gxyL,wa2,kmul(gxzL,wa3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea1 = kdiv(wa1,ksqrt(omega11));
+    CCTK_REAL_VEC ea1 CCTK_ATTRIBUTE_UNUSED = kdiv(wa1,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea2 = kdiv(wa2,ksqrt(omega11));
+    CCTK_REAL_VEC ea2 CCTK_ATTRIBUTE_UNUSED = kdiv(wa2,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ea3 = kdiv(wa3,ksqrt(omega11));
+    CCTK_REAL_VEC ea3 CCTK_ATTRIBUTE_UNUSED = kdiv(wa3,ksqrt(omega11));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega12 = 
+    CCTK_REAL_VEC omega12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vb1,kmadd(gxyL,vb2,kmul(gxzL,vb3))),kmadd(ea2,kmadd(gxyL,vb1,kmadd(gyyL,vb2,kmul(gyzL,vb3))),kmul(ea3,kmadd(gxzL,vb1,kmadd(gyzL,vb2,kmul(gzzL,vb3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb1 = knmsub(ea1,omega12,vb1);
+    CCTK_REAL_VEC wb1 CCTK_ATTRIBUTE_UNUSED = knmsub(ea1,omega12,vb1);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb2 = knmsub(ea2,omega12,vb2);
+    CCTK_REAL_VEC wb2 CCTK_ATTRIBUTE_UNUSED = knmsub(ea2,omega12,vb2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wb3 = knmsub(ea3,omega12,vb3);
+    CCTK_REAL_VEC wb3 CCTK_ATTRIBUTE_UNUSED = knmsub(ea3,omega12,vb3);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega22 = 
+    CCTK_REAL_VEC omega22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wb1,wb1),kmadd(gyyL,kmul(wb2,wb2),kmadd(gzzL,kmul(wb3,wb3),kmul(kmadd(gyzL,kmul(wb2,wb3),kmul(wb1,kmadd(gxyL,wb2,kmul(gxzL,wb3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb1 = kdiv(wb1,ksqrt(omega22));
+    CCTK_REAL_VEC eb1 CCTK_ATTRIBUTE_UNUSED = kdiv(wb1,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb2 = kdiv(wb2,ksqrt(omega22));
+    CCTK_REAL_VEC eb2 CCTK_ATTRIBUTE_UNUSED = kdiv(wb2,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED eb3 = kdiv(wb3,ksqrt(omega22));
+    CCTK_REAL_VEC eb3 CCTK_ATTRIBUTE_UNUSED = kdiv(wb3,ksqrt(omega22));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega13 = 
+    CCTK_REAL_VEC omega13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(ea1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(ea2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(ea3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega23 = 
+    CCTK_REAL_VEC omega23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(eb1,kmadd(gxxL,vc1,kmadd(gxyL,vc2,kmul(gxzL,vc3))),kmadd(eb2,kmadd(gxyL,vc1,kmadd(gyyL,vc2,kmul(gyzL,vc3))),kmul(eb3,kmadd(gxzL,vc1,kmadd(gyzL,vc2,kmul(gzzL,vc3))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc1 = 
+    CCTK_REAL_VEC wc1 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc1,kmadd(eb1,omega23,kmul(ea1,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc2 = 
+    CCTK_REAL_VEC wc2 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc2,kmadd(eb2,omega23,kmul(ea2,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED wc3 = 
+    CCTK_REAL_VEC wc3 CCTK_ATTRIBUTE_UNUSED = 
       ksub(vc3,kmadd(eb3,omega23,kmul(ea3,omega13)));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega33 = 
+    CCTK_REAL_VEC omega33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gxxL,kmul(wc1,wc1),kmadd(gyyL,kmul(wc2,wc2),kmadd(gzzL,kmul(wc3,wc3),kmul(kmadd(gyzL,kmul(wc2,wc3),kmul(wc1,kmadd(gxyL,wc2,kmul(gxzL,wc3)))),ToReal(2)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec1 = kdiv(wc1,ksqrt(omega33));
+    CCTK_REAL_VEC ec1 CCTK_ATTRIBUTE_UNUSED = kdiv(wc1,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec2 = kdiv(wc2,ksqrt(omega33));
+    CCTK_REAL_VEC ec2 CCTK_ATTRIBUTE_UNUSED = kdiv(wc2,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ec3 = kdiv(wc3,ksqrt(omega33));
+    CCTK_REAL_VEC ec3 CCTK_ATTRIBUTE_UNUSED = kdiv(wc3,ksqrt(omega33));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED isqrt2 = 
+    CCTK_REAL_VEC isqrt2 CCTK_ATTRIBUTE_UNUSED = 
       ToReal(0.707106781186547524);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet1 = kmul(eb1,isqrt2);
+    CCTK_REAL_VEC ltet1 CCTK_ATTRIBUTE_UNUSED = kmul(eb1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet2 = kmul(eb2,isqrt2);
+    CCTK_REAL_VEC ltet2 CCTK_ATTRIBUTE_UNUSED = kmul(eb2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ltet3 = kmul(eb3,isqrt2);
+    CCTK_REAL_VEC ltet3 CCTK_ATTRIBUTE_UNUSED = kmul(eb3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n1 = kneg(kmul(eb1,isqrt2));
+    CCTK_REAL_VEC n1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n2 = kneg(kmul(eb2,isqrt2));
+    CCTK_REAL_VEC n2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED n3 = kneg(kmul(eb3,isqrt2));
+    CCTK_REAL_VEC n3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(eb3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rm1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rm2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rm3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rm3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im1 = kmul(ea1,isqrt2);
+    CCTK_REAL_VEC im1 CCTK_ATTRIBUTE_UNUSED = kmul(ea1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im2 = kmul(ea2,isqrt2);
+    CCTK_REAL_VEC im2 CCTK_ATTRIBUTE_UNUSED = kmul(ea2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED im3 = kmul(ea3,isqrt2);
+    CCTK_REAL_VEC im3 CCTK_ATTRIBUTE_UNUSED = kmul(ea3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar1 = kmul(ec1,isqrt2);
+    CCTK_REAL_VEC rmbar1 CCTK_ATTRIBUTE_UNUSED = kmul(ec1,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar2 = kmul(ec2,isqrt2);
+    CCTK_REAL_VEC rmbar2 CCTK_ATTRIBUTE_UNUSED = kmul(ec2,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rmbar3 = kmul(ec3,isqrt2);
+    CCTK_REAL_VEC rmbar3 CCTK_ATTRIBUTE_UNUSED = kmul(ec3,isqrt2);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar1 = kneg(kmul(ea1,isqrt2));
+    CCTK_REAL_VEC imbar1 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea1,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar2 = kneg(kmul(ea2,isqrt2));
+    CCTK_REAL_VEC imbar2 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea2,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED imbar3 = kneg(kmul(ea3,isqrt2));
+    CCTK_REAL_VEC imbar3 CCTK_ATTRIBUTE_UNUSED = kneg(kmul(ea3,isqrt2));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED nn = isqrt2;
+    CCTK_REAL_VEC nn CCTK_ATTRIBUTE_UNUSED = isqrt2;
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1212 = 
+    CCTK_REAL_VEC R1212 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard12gxy,kadd(JacPDstandard21gxy,kmadd(kmadd(gamma122,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma222,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma322))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma221,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(gamma321,kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321)))))),ToReal(2),JacPDstandard22gxx),JacPDstandard11gyy)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1213 = 
+    CCTK_REAL_VEC R1213 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard12gxz,kadd(JacPDstandard31gxy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma232,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma121,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma221,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma321,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard23gxx),JacPDstandard11gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1223 = 
+    CCTK_REAL_VEC R1223 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard22gxz,kadd(JacPDstandard31gyy,kmadd(kmadd(gamma132,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma232,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma332))),ToReal(-2),ksub(kmsub(kmadd(gamma122,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma222,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma322,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard23gxy),JacPDstandard12gyz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1313 = 
+    CCTK_REAL_VEC R1313 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard13gxz,kadd(JacPDstandard31gxz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma111,kmadd(gxyL,gamma211,kmul(gxzL,gamma311))),kmadd(gamma233,kmadd(gxyL,gamma111,kmadd(gyyL,gamma211,kmul(gyzL,gamma311))),kmul(kmadd(gxzL,gamma111,kmadd(gyzL,gamma211,kmul(gzzL,gamma311))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma131,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma231,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(gamma331,kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331)))))),ToReal(2),JacPDstandard33gxx),JacPDstandard11gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R1323 = 
+    CCTK_REAL_VEC R1323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard23gxz,kadd(JacPDstandard31gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma121,kmadd(gxyL,gamma221,kmul(gxzL,gamma321))),kmadd(gamma233,kmadd(gxyL,gamma121,kmadd(gyyL,gamma221,kmul(gyzL,gamma321))),kmul(kmadd(gxzL,gamma121,kmadd(gyzL,gamma221,kmul(gzzL,gamma321))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma131,kmadd(gxyL,gamma231,kmul(gxzL,gamma331))),kmadd(gamma232,kmadd(gxyL,gamma131,kmadd(gyyL,gamma231,kmul(gyzL,gamma331))),kmul(kmadd(gxzL,gamma131,kmadd(gyzL,gamma231,kmul(gzzL,gamma331))),gamma332))),ToReal(2),JacPDstandard33gxy),JacPDstandard12gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R2323 = 
+    CCTK_REAL_VEC R2323 CCTK_ATTRIBUTE_UNUSED = 
       kmul(ToReal(0.5),kadd(JacPDstandard23gyz,kadd(JacPDstandard32gyz,kmadd(kmadd(gamma133,kmadd(gxxL,gamma122,kmadd(gxyL,gamma222,kmul(gxzL,gamma322))),kmadd(gamma233,kmadd(gxyL,gamma122,kmadd(gyyL,gamma222,kmul(gyzL,gamma322))),kmul(kmadd(gxzL,gamma122,kmadd(gyzL,gamma222,kmul(gzzL,gamma322))),gamma333))),ToReal(-2),ksub(kmsub(kmadd(gamma132,kmadd(gxxL,gamma132,kmadd(gxyL,gamma232,kmul(gxzL,gamma332))),kmadd(gamma232,kmadd(gxyL,gamma132,kmadd(gyyL,gamma232,kmul(gyzL,gamma332))),kmul(gamma332,kmadd(gxzL,gamma132,kmadd(gyzL,gamma232,kmul(gzzL,gamma332)))))),ToReal(2),JacPDstandard33gyy),JacPDstandard22gzz)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1212 = 
+    CCTK_REAL_VEC R4p1212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1213 = 
+    CCTK_REAL_VEC R4p1213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1223 = 
+    CCTK_REAL_VEC R4p1223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kyzL,knmsub(kxzL,kyyL,R1223));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1313 = 
+    CCTK_REAL_VEC R4p1313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p1323 = 
+    CCTK_REAL_VEC R4p1323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED R4p2323 = 
+    CCTK_REAL_VEC R4p2323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro111 = ToReal(0);
+    CCTK_REAL_VEC Ro111 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro112 = 
+    CCTK_REAL_VEC Ro112 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma121,kmadd(kxzL,gamma321,kadd(JacPDstandard1kxy,knmsub(kyyL,gamma211,knmsub(kyzL,gamma311,kmsub(kxyL,ksub(gamma221,gamma111),JacPDstandard2kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro113 = 
+    CCTK_REAL_VEC Ro113 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma131,kmadd(kxyL,gamma231,kadd(JacPDstandard1kxz,knmsub(kyzL,gamma211,knmsub(kzzL,gamma311,kmsub(kxzL,ksub(gamma331,gamma111),JacPDstandard3kxx))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro121 = 
+    CCTK_REAL_VEC Ro121 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma211,kmadd(kyzL,gamma311,kadd(JacPDstandard2kxx,knmsub(kxxL,gamma121,knmsub(kxzL,gamma321,kmsub(kxyL,ksub(gamma111,gamma221),JacPDstandard1kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro122 = ToReal(0);
+    CCTK_REAL_VEC Ro122 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro123 = 
+    CCTK_REAL_VEC Ro123 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma131,kmadd(kyyL,gamma231,kadd(JacPDstandard2kxz,knmsub(kxzL,gamma121,knmsub(kzzL,gamma321,kmsub(kyzL,ksub(gamma331,gamma221),JacPDstandard3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro131 = 
+    CCTK_REAL_VEC Ro131 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma211,kmadd(kzzL,gamma311,kadd(JacPDstandard3kxx,knmsub(kxxL,gamma131,knmsub(kxyL,gamma231,kmsub(kxzL,ksub(gamma111,gamma331),JacPDstandard1kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro132 = 
+    CCTK_REAL_VEC Ro132 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma121,kmadd(kzzL,gamma321,kadd(JacPDstandard3kxy,knmsub(kxyL,gamma131,knmsub(kyyL,gamma231,kmsub(kyzL,ksub(gamma221,gamma331),JacPDstandard2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro133 = ToReal(0);
+    CCTK_REAL_VEC Ro133 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro211 = ToReal(0);
+    CCTK_REAL_VEC Ro211 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro212 = 
+    CCTK_REAL_VEC Ro212 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma122,kmadd(kxzL,gamma322,kadd(JacPDstandard1kyy,knmsub(kyyL,gamma221,knmsub(kyzL,gamma321,kmsub(kxyL,ksub(gamma222,gamma121),JacPDstandard2kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro213 = 
+    CCTK_REAL_VEC Ro213 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxyL,gamma232,kadd(JacPDstandard1kyz,knmsub(kyzL,gamma221,knmsub(kzzL,gamma321,kmsub(kxzL,ksub(gamma332,gamma121),JacPDstandard3kxy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro221 = 
+    CCTK_REAL_VEC Ro221 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma221,kmadd(kyzL,gamma321,kadd(JacPDstandard2kxy,knmsub(kxxL,gamma122,knmsub(kxzL,gamma322,kmsub(kxyL,ksub(gamma121,gamma222),JacPDstandard1kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro222 = ToReal(0);
+    CCTK_REAL_VEC Ro222 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro223 = 
+    CCTK_REAL_VEC Ro223 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma132,kmadd(kyyL,gamma232,kadd(JacPDstandard2kyz,knmsub(kxzL,gamma122,knmsub(kzzL,gamma322,kmsub(kyzL,ksub(gamma332,gamma222),JacPDstandard3kyy))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro231 = 
+    CCTK_REAL_VEC Ro231 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma221,kmadd(kzzL,gamma321,kadd(JacPDstandard3kxy,knmsub(kxxL,gamma132,knmsub(kxyL,gamma232,kmsub(kxzL,ksub(gamma121,gamma332),JacPDstandard1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro232 = 
+    CCTK_REAL_VEC Ro232 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma122,kmadd(kzzL,gamma322,kadd(JacPDstandard3kyy,knmsub(kxyL,gamma132,knmsub(kyyL,gamma232,kmsub(kyzL,ksub(gamma222,gamma332),JacPDstandard2kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro233 = ToReal(0);
+    CCTK_REAL_VEC Ro233 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro311 = ToReal(0);
+    CCTK_REAL_VEC Ro311 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro312 = 
+    CCTK_REAL_VEC Ro312 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma132,kmadd(kxzL,gamma332,kadd(JacPDstandard1kyz,knmsub(kyyL,gamma231,knmsub(kyzL,gamma331,kmsub(kxyL,ksub(gamma232,gamma131),JacPDstandard2kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro313 = 
+    CCTK_REAL_VEC Ro313 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxxL,gamma133,kmadd(kxyL,gamma233,kadd(JacPDstandard1kzz,knmsub(kyzL,gamma231,knmsub(kzzL,gamma331,kmsub(kxzL,ksub(gamma333,gamma131),JacPDstandard3kxz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro321 = 
+    CCTK_REAL_VEC Ro321 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyyL,gamma231,kmadd(kyzL,gamma331,kadd(JacPDstandard2kxz,knmsub(kxxL,gamma132,knmsub(kxzL,gamma332,kmsub(kxyL,ksub(gamma131,gamma232),JacPDstandard1kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro322 = ToReal(0);
+    CCTK_REAL_VEC Ro322 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro323 = 
+    CCTK_REAL_VEC Ro323 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxyL,gamma133,kmadd(kyyL,gamma233,kadd(JacPDstandard2kzz,knmsub(kxzL,gamma132,knmsub(kzzL,gamma332,kmsub(kyzL,ksub(gamma333,gamma232),JacPDstandard3kyz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro331 = 
+    CCTK_REAL_VEC Ro331 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kyzL,gamma231,kmadd(kzzL,gamma331,kadd(JacPDstandard3kxz,knmsub(kxxL,gamma133,knmsub(kxyL,gamma233,kmsub(kxzL,ksub(gamma131,gamma333),JacPDstandard1kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro332 = 
+    CCTK_REAL_VEC Ro332 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,gamma132,kmadd(kzzL,gamma332,kadd(JacPDstandard3kyz,knmsub(kxyL,gamma133,knmsub(kyyL,gamma233,kmsub(kyzL,ksub(gamma232,gamma333),JacPDstandard2kzz))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Ro333 = ToReal(0);
+    CCTK_REAL_VEC Ro333 CCTK_ATTRIBUTE_UNUSED = ToReal(0);
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo11 = 
+    CCTK_REAL_VEC Rojo11 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv23,gInv32),kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv22,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo12 = 
+    CCTK_REAL_VEC Rojo12 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv23,R1223,knmsub(gInv21,R1212,knmsub(gInv31,R1213,kmadd(gInv12,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv32,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo13 = 
+    CCTK_REAL_VEC Rojo13 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv23),kmadd(gInv13,kmul(kxzL,kxzL),knmsub(gInv21,R1213,knmsub(gInv31,R1313,knmsub(gInv32,R1323,kmadd(gInv12,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv23,kmul(kxxL,gInv13))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo21 = 
+    CCTK_REAL_VEC Rojo21 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv32,R1223,knmsub(gInv12,R1212,knmsub(gInv13,R1213,kmadd(gInv21,kmsub(kxyL,kxyL,kmul(kxxL,kyyL)),kmadd(gInv23,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmul(gInv33,kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo22 = 
+    CCTK_REAL_VEC Rojo22 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv13,gInv31),kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmadd(gInv11,kmadd(kxxL,kyyL,knmsub(kxyL,kxyL,R1212)),kmul(gInv33,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo23 = 
+    CCTK_REAL_VEC Rojo23 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv12,R1223,knmsub(gInv31,R1323,knmsub(gInv32,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv21,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv13,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv23,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo31 = 
+    CCTK_REAL_VEC Rojo31 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kxzL,kmul(kyzL,gInv32),kmadd(gInv31,kmul(kxzL,kxzL),knmsub(gInv12,R1213,knmsub(gInv13,R1313,knmsub(gInv23,R1323,kmadd(gInv21,kmsub(kxyL,kxzL,kmul(kxxL,kyzL)),kmsub(gInv22,kmsub(kxzL,kyyL,kmadd(kxyL,kyzL,R1223)),kmul(kzzL,kmadd(kxyL,gInv32,kmul(kxxL,gInv31))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo32 = 
+    CCTK_REAL_VEC Rojo32 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(gInv21,R1223,knmsub(gInv13,R1323,knmsub(gInv23,R2323,kmadd(gInv11,kmadd(kxxL,kyzL,knmsub(kxyL,kxzL,R1213)),kmadd(gInv12,kmsub(kxyL,kyzL,kmul(kxzL,kyyL)),kmadd(gInv31,kmsub(kxzL,kyzL,kmul(kxyL,kzzL)),kmul(gInv32,kmsub(kyzL,kyzL,kmul(kyyL,kzzL)))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Rojo33 = 
+    CCTK_REAL_VEC Rojo33 CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kadd(gInv12,gInv21),kmadd(kxyL,kzzL,knmsub(kxzL,kyzL,R1323)),kmadd(gInv11,kmadd(kxxL,kzzL,knmsub(kxzL,kxzL,R1313)),kmul(gInv22,kmadd(kyyL,kzzL,knmsub(kyzL,kyzL,R2323)))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4rL = 
+    CCTK_REAL_VEC Psi4rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2)))))),kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),knmsub(kmul(nn,nn),kmadd(imbar1,kmadd(imbar2,kadd(Rojo12,Rojo21),kmul(imbar3,kadd(Rojo13,Rojo31))),knmsub(rmbar1,kmadd(rmbar2,kadd(Rojo12,Rojo21),kmul(rmbar3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo32,kmsub(imbar2,imbar3,kmul(rmbar2,rmbar3)),kmadd(Rojo11,kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(Rojo22,kmsub(imbar2,imbar2,kmul(rmbar2,rmbar2)),kmul(Rojo33,kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3))))))))),kmsub(kmadd(kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmsub(imbar1,imbar2,kmul(rmbar1,rmbar2)),kmadd(kmadd(n1,kmul(n2,R4p1213),kmadd(n1,kmul(n3,R4p1313),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2))))),kmsub(imbar1,imbar3,kmul(rmbar1,rmbar3)),kmadd(kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmul(nn,kmadd(kmadd(n1,Ro112,kmadd(n2,Ro122,kmul(n3,Ro132))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro211,kmadd(n2,Ro221,kmul(n3,Ro231))),kmsub(rmbar1,rmbar2,kmul(imbar1,imbar2)),kmadd(kmadd(n1,Ro113,kmadd(n2,Ro123,kmul(n3,Ro133))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro311,kmadd(n2,Ro321,kmul(n3,Ro331))),kmsub(rmbar1,rmbar3,kmul(imbar1,imbar3)),kmadd(kmadd(n1,Ro213,kmadd(n2,Ro223,kmul(n3,Ro233))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro312,kmadd(n2,Ro322,kmul(n3,Ro332))),kmsub(rmbar2,rmbar3,kmul(imbar2,imbar3)),kmadd(kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131))),kmsub(rmbar1,rmbar1,kmul(imbar1,imbar1)),kmadd(kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232))),kmsub(rmbar2,rmbar2,kmul(imbar2,imbar2)),kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),kmsub(rmbar3,rmbar3,kmul(imbar3,imbar3))))))))))))))),ToReal(2),kmadd(kmsub(imbar3,imbar3,kmul(rmbar3,rmbar3)),kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(imbar1,imbar1,kmul(rmbar1,rmbar1)),kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi4iL = 
+    CCTK_REAL_VEC Psi4iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kmadd(n2,R4p1213,kmul(n3,R4p1313)),kmadd(n2,kmul(n3,R4p1323),kmul(R4p1223,kmul(n2,n2)))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(n1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmul(n3,kmadd(n2,R4p1223,kmul(n3,R4p1323)))),kmul(nn,kmadd(kmadd(im1,kmul(rm1,kmadd(n1,Ro111,kmadd(n2,Ro121,kmul(n3,Ro131)))),kmul(im2,kmul(rm2,kmadd(n1,Ro212,kmadd(n2,Ro222,kmul(n3,Ro232)))))),ToReal(-2),kmsub(im3,kmul(rm3,kmul(kmadd(n1,Ro313,kmadd(n2,Ro323,kmul(n3,Ro333))),ToReal(-2))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(n1,kadd(Ro211,Ro112),kmadd(n3,kadd(Ro231,Ro132),kmul(n2,kadd(Ro221,Ro122)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(n1,kadd(Ro312,Ro213),kmadd(n3,kadd(Ro332,Ro233),kmul(n2,kadd(Ro322,Ro223)))),kmul(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(n1,kadd(Ro311,Ro113),kmadd(n3,kadd(Ro331,Ro133),kmul(n2,kadd(Ro321,Ro123)))))))))))),ToReal(2),kmsub(ToReal(-2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(n1,n1),kmadd(R4p2323,kmul(n3,n3),kmul(n1,kmul(n3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(n1,n1),kmsub(n1,kmsub(n2,R4p1223,kmul(n3,R4p1323)),kmul(n2,kmul(n3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(n2,n2),kmadd(R4p1313,kmul(n3,n3),kmul(n2,kmul(n3,kmul(R4p1213,ToReal(2))))))),kmul(im3,kmul(rm3,kmadd(R4p1313,kmul(n1,n1),kmadd(R4p2323,kmul(n2,n2),kmul(n1,kmul(n2,kmul(R4p1323,ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi3rL = 
+    CCTK_REAL_VEC Psi3rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(kmadd(rm1,Rojo11,kmadd(rm2,Rojo12,kmul(rm3,Rojo13))),ksub(n1,ltet1),kmadd(kmadd(rm1,Rojo21,kmadd(rm2,Rojo22,kmul(rm3,Rojo23))),ksub(n2,ltet2),kmul(kmadd(rm1,Rojo31,kmadd(rm2,Rojo32,kmul(rm3,Rojo33))),ksub(n3,ltet3)))),kmadd(n3,kmadd(ltet1,kmadd(n2,kmul(R4p1213,rm1),kmadd(n3,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1223,rm2),kmul(n3,kmul(R4p1323,rm2))))),kmadd(nn,kmul(rm2,kmul(Ro223,kmadd(ltet2,ToReal(-2),n2))),kmadd(nn,kmul(rm3,kmul(Ro333,kmadd(ltet3,ToReal(-2),n3))),knmsub(ltet3,kmadd(n1,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1323,rm1),kmadd(n1,kmul(R4p1323,rm2),kmul(n2,kmul(R4p2323,rm2))))),kmadd(ltet2,kmsub(n3,kmadd(R4p1323,rm1,kmul(R4p2323,rm2)),kmul(n1,kmadd(R4p1213,rm1,kmul(R4p1223,rm2)))),kmadd(nn,kmul(Ro313,kmsub(rm1,ksub(n3,ltet3),kmul(ltet1,rm3))),kmadd(nn,kmul(Ro323,kmsub(rm2,ksub(n3,ltet3),kmul(ltet2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro113,kmadd(ltet1,ToReal(-2),n1)),kmadd(Ro123,kmadd(ltet2,rm1,kmul(rm2,ksub(ltet1,n1))),kmadd(Ro133,kmadd(ltet3,rm1,kmul(rm3,ksub(ltet1,n1))),kmadd(Ro233,kmadd(ltet3,rm2,kmul(rm3,ksub(ltet2,n2))),kmul(Ro213,kmadd(ltet1,rm2,kmul(rm1,ksub(ltet2,n2)))))))))))))))),kmadd(n1,kmadd(ltet3,kmadd(n1,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1223,rm2),kmadd(n1,kmul(R4p1313,rm3),kmul(n2,kmul(R4p1323,rm3))))),kmadd(nn,kmul(rm2,kmul(Ro221,kmadd(ltet2,ToReal(-2),n2))),kmadd(nn,kmul(rm3,kmul(Ro331,kmadd(ltet3,ToReal(-2),n3))),knmsub(ltet1,kmadd(n2,kmul(R4p1212,rm2),kmadd(n3,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1213,rm3),kmul(n3,kmul(R4p1313,rm3))))),kmadd(ltet2,kmsub(n1,kmadd(R4p1212,rm2,kmul(R4p1213,rm3)),kmul(n3,kmadd(R4p1223,rm2,kmul(R4p1323,rm3)))),kmadd(nn,kmsub(Ro121,kmsub(rm2,ksub(n1,ltet1),kmul(ltet2,rm1)),kmul(Ro231,kmadd(ltet3,rm2,kmul(rm3,ksub(ltet2,n2))))),kmadd(nn,kmsub(Ro131,kmsub(rm3,ksub(n1,ltet1),kmul(ltet3,rm1)),kmul(Ro311,kmadd(ltet1,rm3,kmul(rm1,ksub(ltet3,n3))))),kmul(nn,kmsub(rm1,kmul(Ro111,kmadd(ltet1,ToReal(-2),n1)),kmadd(Ro321,kmadd(ltet2,rm3,kmul(rm2,ksub(ltet3,n3))),kmul(Ro211,kmadd(ltet1,rm2,kmul(rm1,ksub(ltet2,n2)))))))))))))),kmul(n2,kmadd(ltet3,kmadd(n1,kmul(R4p1323,rm3),kmsub(n2,kmul(R4p2323,rm3),kmul(rm1,kmadd(n2,R4p1223,kmul(n1,R4p1213))))),kmadd(ltet1,kmsub(kmadd(n2,R4p1212,kmul(n3,R4p1213)),rm1,kmul(rm3,kmadd(n3,R4p1323,kmul(n2,R4p1223)))),kmadd(ltet2,kmadd(rm1,kmsub(n3,R4p1223,kmul(n1,R4p1212)),kmul(rm3,kmsub(n1,R4p1223,kmul(n3,R4p2323)))),kmul(nn,kmadd(rm1,kmul(Ro112,kmadd(ltet1,ToReal(-2),n1)),kmadd(rm2,kmul(Ro222,kmadd(ltet2,ToReal(-2),n2)),kmadd(rm3,kmul(Ro332,kmadd(ltet3,ToReal(-2),n3)),kmadd(Ro212,kmsub(rm1,ksub(n2,ltet2),kmul(ltet1,rm2)),kmsub(Ro232,kmsub(rm3,ksub(n2,ltet2),kmul(ltet3,rm2)),kmadd(Ro122,kmadd(ltet2,rm1,kmul(rm2,ksub(ltet1,n1))),kmadd(Ro132,kmadd(ltet3,rm1,kmul(rm3,ksub(ltet1,n1))),kmadd(Ro322,kmadd(ltet2,rm3,kmul(rm2,ksub(ltet3,n3))),kmul(Ro312,kmadd(ltet1,rm3,kmul(rm1,ksub(ltet3,n3))))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi3iL = 
+    CCTK_REAL_VEC Psi3iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmul(nn,nn),kmadd(kmadd(im1,Rojo11,kmadd(im2,Rojo12,kmul(im3,Rojo13))),ksub(n1,ltet1),kmadd(kmadd(im1,Rojo21,kmadd(im2,Rojo22,kmul(im3,Rojo23))),ksub(n2,ltet2),kmul(kmadd(im1,Rojo31,kmadd(im2,Rojo32,kmul(im3,Rojo33))),ksub(n3,ltet3)))),kmadd(n1,kmul(nn,kmul(Ro121,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n2,kmul(nn,kmul(Ro122,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n3,kmul(nn,kmul(Ro123,kmadd(im1,ltet2,kmul(im2,ksub(ltet1,n1))))),kmadd(n1,kmul(nn,kmul(Ro131,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n2,kmul(nn,kmul(Ro132,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n3,kmul(nn,kmul(Ro133,kmadd(im1,ltet3,kmul(im3,ksub(ltet1,n1))))),kmadd(n1,kmul(nn,kmul(Ro211,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n2,kmul(nn,kmul(Ro212,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n3,kmul(nn,kmul(Ro213,kmadd(im2,ltet1,kmul(im1,ksub(ltet2,n2))))),kmadd(n1,kmul(nn,kmul(Ro231,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n2,kmul(nn,kmul(Ro232,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n3,kmul(nn,kmul(Ro233,kmadd(im2,ltet3,kmul(im3,ksub(ltet2,n2))))),kmadd(n1,kmul(nn,kmul(Ro311,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n2,kmul(nn,kmul(Ro312,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n3,kmul(nn,kmul(Ro313,kmadd(im3,ltet1,kmul(im1,ksub(ltet3,n3))))),kmadd(n1,kmul(nn,kmul(Ro321,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(n2,kmul(nn,kmul(Ro322,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(n3,kmul(nn,kmul(Ro323,kmadd(im3,ltet2,kmul(im2,ksub(ltet3,n3))))),kmadd(im2,kmul(n1,kmul(nn,kmul(Ro221,kmsub(ltet2,ToReal(2),n2)))),kmadd(im2,kmul(n2,kmul(nn,kmul(Ro222,kmsub(ltet2,ToReal(2),n2)))),kmadd(im2,kmul(n3,kmul(nn,kmul(Ro223,kmsub(ltet2,ToReal(2),n2)))),kmadd(im3,kmul(n1,kmul(nn,kmul(Ro331,kmsub(ltet3,ToReal(2),n3)))),kmadd(im3,kmul(n2,kmul(nn,kmul(Ro332,kmsub(ltet3,ToReal(2),n3)))),kmadd(im3,kmul(n3,kmul(nn,kmul(Ro333,kmsub(ltet3,ToReal(2),n3)))),kmadd(n1,knmsub(im2,kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3))))),kmsub(im1,kmul(nn,kmul(Ro111,kmsub(ltet1,ToReal(2),n1))),kmul(im3,kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)))))))),kmadd(n2,kmsub(im1,kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmadd(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3)),kmul(nn,kmul(Ro112,kmsub(ltet1,ToReal(2),n1)))))),kmul(im3,kmadd(R4p1223,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1323,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p2323,kmsub(ltet3,n2,kmul(ltet2,n3))))))),kmul(n3,kmsub(im1,kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmadd(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)),kmul(nn,kmul(Ro113,kmsub(ltet1,ToReal(2),n1)))))),kmul(im2,kmadd(R4p1223,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1323,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p2323,kmsub(ltet2,n3,kmul(ltet3,n2)))))))))))))))))))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi2rL = 
+    CCTK_REAL_VEC Psi2rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(ltet2,kmul(n2,R4p1212),kmadd(ltet3,kmul(n2,R4p1213),kmadd(ltet2,kmul(n3,R4p1213),kmul(ltet3,kmul(n3,R4p1313))))),kmadd(im1,im1,kmul(rm1,rm1)),knmsub(kmadd(ltet1,kmul(n1,R4p1313),kmadd(ltet2,kmul(n1,R4p1323),kmadd(ltet1,kmul(n2,R4p1323),kmul(ltet2,kmul(n2,R4p2323))))),kmadd(im3,im3,kmul(rm3,rm3)),knmsub(kmul(nn,nn),kmadd(im2,kmul(im3,Rojo23),kmadd(rm2,kmul(rm3,Rojo23),kmadd(im1,kmadd(im2,kadd(Rojo12,Rojo21),kmul(im3,kadd(Rojo13,Rojo31))),kmadd(rm1,kmadd(rm2,kadd(Rojo12,Rojo21),kmul(rm3,kadd(Rojo13,Rojo31))),kmadd(im2,kmul(im3,Rojo32),kmadd(rm2,kmul(rm3,Rojo32),kmadd(Rojo11,kmul(im1,im1),kmadd(Rojo22,kmul(im2,im2),kmadd(Rojo33,kmul(im3,im3),kmadd(Rojo11,kmul(rm1,rm1),kmadd(Rojo22,kmul(rm2,rm2),kmul(Rojo33,kmul(rm3,rm3))))))))))))),knmsub(kmadd(im2,im2,kmul(rm2,rm2)),kmadd(n3,kmsub(ltet3,R4p2323,kmul(ltet1,R4p1223)),kmul(n1,kmsub(ltet1,R4p1212,kmul(ltet3,R4p1223)))),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmadd(ltet2,kmul(n3,R4p2323),kmadd(ltet3,kmadd(n1,R4p1323,kmul(n2,R4p2323)),kmsub(ltet1,kmsub(n3,R4p1323,kmadd(n2,R4p1223,kmul(n1,R4p1213))),kmul(n1,kmadd(ltet2,R4p1223,kmul(ltet1,R4p1213)))))),kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmadd(ltet1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmadd(ltet3,kmadd(n1,R4p1213,kmsub(n3,kmul(R4p1323,ToReal(-2)),kmul(n2,R4p1223))),kmul(ltet2,kmsub(n1,R4p1212,kmul(n3,R4p1223))))),kmadd(nn,kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmul(Ro211,ksub(n1,ltet1)),kmadd(kmadd(im1,im3,kmul(rm1,rm3)),kmul(Ro311,ksub(n1,ltet1)),kmadd(Ro111,kmul(kmadd(im1,im1,kmul(rm1,rm1)),ksub(n1,ltet1)),kmadd(kmadd(im1,im2,kmul(rm1,rm2)),kmul(Ro122,ksub(n2,ltet2)),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmul(Ro322,ksub(n2,ltet2)),kmadd(Ro222,kmul(kmadd(im2,im2,kmul(rm2,rm2)),ksub(n2,ltet2)),kmadd(kmadd(im1,im3,kmul(rm1,rm3)),kmul(Ro133,ksub(n3,ltet3)),kmadd(kmadd(im2,im3,kmul(rm2,rm3)),kmul(Ro233,ksub(n3,ltet3)),kmadd(Ro333,kmul(kmadd(im3,im3,kmul(rm3,rm3)),ksub(n3,ltet3)),kmadd(Ro112,kmsub(n2,kmadd(im1,im1,kmul(rm1,rm1)),kmul(ltet1,kmadd(im1,im2,kmul(rm1,rm2)))),kmadd(Ro221,kmsub(n1,kmadd(im2,im2,kmul(rm2,rm2)),kmul(ltet2,kmadd(im1,im2,kmul(rm1,rm2)))),kmadd(Ro113,kmsub(n3,kmadd(im1,im1,kmul(rm1,rm1)),kmul(ltet1,kmadd(im1,im3,kmul(rm1,rm3)))),kmadd(Ro331,kmsub(n1,kmadd(im3,im3,kmul(rm3,rm3)),kmul(ltet3,kmadd(im1,im3,kmul(rm1,rm3)))),kmadd(Ro223,kmsub(n3,kmadd(im2,im2,kmul(rm2,rm2)),kmul(ltet2,kmadd(im2,im3,kmul(rm2,rm3)))),kmadd(Ro332,kmsub(n2,kmadd(im3,im3,kmul(rm3,rm3)),kmul(ltet3,kmadd(im2,im3,kmul(rm2,rm3)))),kmadd(Ro121,kmsub(n1,kmadd(im1,im2,kmul(rm1,rm2)),kmul(ltet2,kmadd(im1,im1,kmul(rm1,rm1)))),kmadd(Ro131,kmsub(n1,kmadd(im1,im3,kmul(rm1,rm3)),kmul(ltet3,kmadd(im1,im1,kmul(rm1,rm1)))),kmadd(Ro212,kmsub(n2,kmadd(im1,im2,kmul(rm1,rm2)),kmul(ltet1,kmadd(im2,im2,kmul(rm2,rm2)))),kmadd(Ro232,kmsub(n2,kmadd(im2,im3,kmul(rm2,rm3)),kmul(ltet3,kmadd(im2,im2,kmul(rm2,rm2)))),kmadd(Ro313,kmsub(n3,kmadd(im1,im3,kmul(rm1,rm3)),kmul(ltet1,kmadd(im3,im3,kmul(rm3,rm3)))),kmadd(Ro323,kmsub(n3,kmadd(im2,im3,kmul(rm2,rm3)),kmul(ltet2,kmadd(im3,im3,kmul(rm3,rm3)))),kmadd(Ro321,kmadd(im3,kmsub(im2,n1,kmul(im1,ltet2)),kmul(rm3,kmsub(n1,rm2,kmul(ltet2,rm1)))),kmadd(Ro231,kmadd(im2,kmsub(im3,n1,kmul(im1,ltet3)),kmul(rm2,kmsub(n1,rm3,kmul(ltet3,rm1)))),kmadd(Ro312,kmadd(im3,kmsub(im1,n2,kmul(im2,ltet1)),kmul(rm3,kmsub(n2,rm1,kmul(ltet1,rm2)))),kmadd(Ro132,kmadd(im1,kmsub(im3,n2,kmul(im2,ltet3)),kmul(rm1,kmsub(n2,rm3,kmul(ltet3,rm2)))),kmadd(Ro213,kmadd(im2,kmsub(im1,n3,kmul(im3,ltet1)),kmul(rm2,kmsub(n3,rm1,kmul(ltet1,rm3)))),kmul(Ro123,kmadd(im1,kmsub(im2,n3,kmul(im3,ltet2)),kmul(rm1,kmsub(n3,rm2,kmul(ltet2,rm3))))))))))))))))))))))))))))))),kmul(kmadd(im1,im3,kmul(rm1,rm3)),kmadd(ltet2,kmul(n1,R4p1213),kmadd(ltet1,kmul(n2,R4p1213),kmadd(ltet3,kmul(n1,R4p1313),kmadd(ltet1,kmul(n3,R4p1313),kmadd(ltet3,kmul(n2,R4p1323),kmadd(ltet2,kmul(n3,R4p1323),kmul(ltet2,kmul(n2,kmul(R4p1223,ToReal(2))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi2iL = 
+    CCTK_REAL_VEC Psi2iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmsub(im3,rm1,kmul(im1,rm3)),kmadd(R4p1213,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1313,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1323,kmsub(ltet2,n3,kmul(ltet3,n2))))),kmadd(kmsub(im2,rm1,kmul(im1,rm2)),kmadd(ltet1,kmadd(n2,R4p1212,kmul(n3,R4p1213)),kmsub(R4p1223,kmsub(ltet2,n3,kmul(ltet3,n2)),kmul(n1,kmadd(ltet3,R4p1213,kmul(ltet2,R4p1212))))),kmadd(kmsub(im3,rm2,kmul(im2,rm3)),kmadd(ltet1,kmadd(n1,R4p1213,kmul(n2,R4p1223)),kmadd(ltet1,kmul(n3,R4p1323),kmsub(ltet2,kmul(n3,R4p2323),kmadd(n1,kmadd(ltet2,R4p1223,kmul(ltet1,R4p1213)),kmul(ltet3,kmadd(n1,R4p1323,kmul(n2,R4p2323))))))),kmsub(kmul(nn,nn),kmadd(im1,kmadd(rm2,ksub(Rojo21,Rojo12),kmul(rm3,ksub(Rojo31,Rojo13))),kmadd(im2,kmadd(rm1,ksub(Rojo12,Rojo21),kmul(rm3,ksub(Rojo32,Rojo23))),kmul(im3,kmadd(rm1,ksub(Rojo13,Rojo31),kmul(rm2,ksub(Rojo23,Rojo32)))))),kmul(nn,kmadd(im1,kmadd(n2,kmul(rm2,Ro212),kmadd(n3,kmul(rm2,Ro213),kmadd(ltet2,kmul(rm2,Ro221),kmadd(ltet3,kmul(rm2,Ro231),kmadd(n2,kmul(rm3,Ro312),kmadd(n3,kmul(rm3,Ro313),kmadd(ltet2,kmul(rm3,Ro321),kmadd(ltet3,kmul(rm3,Ro331),knmsub(rm2,kmadd(n3,Ro123,kmadd(Ro122,kadd(n2,ltet2),kmul(ltet3,Ro132))),knmsub(rm3,kmadd(ltet2,Ro123,kmadd(Ro133,kadd(n3,ltet3),kmul(n2,Ro132))),kmadd(ltet1,kmadd(rm2,ksub(Ro211,Ro112),kmul(rm3,ksub(Ro311,Ro113))),kmul(n1,kmadd(rm2,ksub(Ro211,Ro121),kmul(rm3,ksub(Ro311,Ro131))))))))))))))),kmadd(im2,kmadd(ltet2,kmul(rm3,Ro322),kmadd(n2,kmul(rm3,Ro322),kmadd(n3,kmul(rm3,Ro323),kmadd(ltet3,kmul(rm3,Ro332),knmsub(rm3,kmadd(ltet2,Ro223,kmadd(Ro233,kadd(n3,ltet3),kmul(n2,Ro232))),kmadd(ltet1,kmadd(rm1,ksub(Ro112,Ro211),kmul(rm3,ksub(Ro312,Ro213))),kmadd(rm1,kmadd(n2,ksub(Ro122,Ro212),kmadd(n3,ksub(Ro123,Ro213),kmadd(ltet2,ksub(Ro122,Ro221),kmul(ltet3,ksub(Ro132,Ro231))))),kmul(n1,kmadd(rm1,ksub(Ro121,Ro211),kmul(rm3,ksub(Ro321,Ro231))))))))))),kmul(im3,kmadd(rm1,kmadd(kadd(ltet3,n3),Ro133,knmsub(n3,Ro313,knmsub(ltet3,Ro331,kmadd(n1,ksub(Ro131,Ro311),kmul(n2,ksub(Ro132,Ro312)))))),kmadd(ltet1,kmadd(rm1,ksub(Ro113,Ro311),kmul(rm2,ksub(Ro213,Ro312))),kmadd(ltet2,kmadd(rm1,ksub(Ro123,Ro321),kmul(rm2,ksub(Ro223,Ro322))),kmul(rm2,kmadd(kadd(ltet3,n3),Ro233,knmsub(n3,Ro323,knmsub(ltet3,Ro332,kmadd(n1,ksub(Ro231,Ro321),kmul(n2,ksub(Ro232,Ro322))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi1rL = 
+    CCTK_REAL_VEC Psi1rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(kmadd(rm1,Rojo11,kmadd(rm2,Rojo12,kmul(rm3,Rojo13))),ksub(ltet1,n1),kmadd(rm1,kmadd(Rojo21,ksub(ltet2,n2),kmul(Rojo31,ksub(ltet3,n3))),kmadd(rm2,kmadd(Rojo22,ksub(ltet2,n2),kmul(Rojo32,ksub(ltet3,n3))),kmul(rm3,kmadd(Rojo23,ksub(ltet2,n2),kmul(Rojo33,ksub(ltet3,n3))))))),kmadd(ltet1,kmadd(ltet1,kmadd(n2,kmul(R4p1212,rm2),kmadd(n3,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1213,rm3),kmul(n3,kmul(R4p1313,rm3))))),kmadd(nn,kmul(rm2,kmul(Ro221,kmadd(n2,ToReal(-2),ltet2))),kmadd(nn,kmul(rm3,kmul(Ro331,kmadd(n3,ToReal(-2),ltet3))),knmsub(ltet3,kmadd(n1,kmul(R4p1213,rm2),kmadd(n2,kmul(R4p1223,rm2),kmadd(n1,kmul(R4p1313,rm3),kmul(n2,kmul(R4p1323,rm3))))),kmadd(ltet2,kmsub(n3,kmadd(R4p1223,rm2,kmul(R4p1323,rm3)),kmul(n1,kmadd(R4p1212,rm2,kmul(R4p1213,rm3)))),kmadd(nn,kmul(Ro121,kmsub(rm2,ksub(ltet1,n1),kmul(n2,rm1))),kmadd(nn,kmul(Ro131,kmsub(rm3,ksub(ltet1,n1),kmul(n3,rm1))),kmadd(nn,kmul(Ro211,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2))),kmadd(nn,kmul(Ro311,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3))),kmadd(nn,kmul(Ro321,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro111,kmadd(n1,ToReal(-2),ltet1)),kmul(Ro231,kmadd(n3,rm2,kmul(rm3,ksub(n2,ltet2)))))))))))))))),kmadd(ltet3,kmadd(ltet3,kmadd(n1,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1323,rm1),kmadd(n1,kmul(R4p1323,rm2),kmul(n2,kmul(R4p2323,rm2))))),kmadd(nn,kmul(rm2,kmul(Ro223,kmadd(n2,ToReal(-2),ltet2))),kmadd(nn,kmul(rm3,kmul(Ro333,kmadd(n3,ToReal(-2),ltet3))),knmsub(ltet1,kmadd(n2,kmul(R4p1213,rm1),kmadd(n3,kmul(R4p1313,rm1),kmadd(n2,kmul(R4p1223,rm2),kmul(n3,kmul(R4p1323,rm2))))),kmadd(ltet2,kmsub(n1,kmadd(R4p1213,rm1,kmul(R4p1223,rm2)),kmul(n3,kmadd(R4p1323,rm1,kmul(R4p2323,rm2)))),kmadd(nn,kmul(Ro213,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2))),kmadd(nn,kmul(Ro313,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3))),kmadd(nn,kmul(Ro323,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3))),kmul(nn,kmsub(rm1,kmul(Ro113,kmadd(n1,ToReal(-2),ltet1)),kmadd(Ro123,kmadd(n2,rm1,kmul(rm2,ksub(n1,ltet1))),kmadd(Ro233,kmadd(n3,rm2,kmul(rm3,ksub(n2,ltet2))),kmul(Ro133,kmadd(n3,rm1,kmul(rm3,ksub(n1,ltet1)))))))))))))))),kmul(ltet2,kmadd(ltet1,kmadd(n2,kmul(R4p1223,rm3),kmsub(n3,kmul(R4p1323,rm3),kmul(rm1,kmadd(n3,R4p1213,kmul(n2,R4p1212))))),kmadd(ltet2,kmadd(rm3,kmsub(n3,R4p2323,kmul(n1,R4p1223)),kmul(rm1,kmsub(n1,R4p1212,kmul(n3,R4p1223)))),kmadd(ltet3,kmsub(kmadd(n1,R4p1213,kmul(n2,R4p1223)),rm1,kmul(rm3,kmadd(n2,R4p2323,kmul(n1,R4p1323)))),kmul(nn,kmadd(rm1,kmul(Ro112,kmadd(n1,ToReal(-2),ltet1)),kmadd(rm2,kmul(Ro222,kmadd(n2,ToReal(-2),ltet2)),kmadd(rm3,kmul(Ro332,kmadd(n3,ToReal(-2),ltet3)),knmsub(Ro122,kmadd(n2,rm1,kmul(rm2,ksub(n1,ltet1))),knmsub(Ro132,kmadd(n3,rm1,kmul(rm3,ksub(n1,ltet1))),kmadd(Ro212,kmsub(rm1,ksub(ltet2,n2),kmul(n1,rm2)),kmadd(Ro232,kmsub(rm3,ksub(ltet2,n2),kmul(n3,rm2)),kmadd(Ro312,kmsub(rm1,ksub(ltet3,n3),kmul(n1,rm3)),kmul(Ro322,kmsub(rm2,ksub(ltet3,n3),kmul(n2,rm3)))))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi1iL = 
+    CCTK_REAL_VEC Psi1iL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmul(nn,nn),kmadd(im1,kmadd(Rojo11,ksub(ltet1,n1),kmadd(Rojo21,ksub(ltet2,n2),kmul(Rojo31,ksub(ltet3,n3)))),kmadd(im2,kmadd(Rojo12,ksub(ltet1,n1),kmadd(Rojo22,ksub(ltet2,n2),kmul(Rojo32,ksub(ltet3,n3)))),kmul(im3,kmadd(Rojo13,ksub(ltet1,n1),kmadd(Rojo23,ksub(ltet2,n2),kmul(Rojo33,ksub(ltet3,n3))))))),kmadd(ltet1,kmadd(im2,kmadd(nn,kmul(Ro221,kmadd(n2,ToReal(-2),ltet2)),kmadd(R4p1212,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1213,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1223,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmadd(im3,kmadd(nn,kmul(Ro331,kmadd(n3,ToReal(-2),ltet3)),kmadd(R4p1213,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1313,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p1323,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmul(nn,kmadd(im1,kmul(Ro111,kmadd(n1,ToReal(-2),ltet1)),knmsub(Ro211,kmadd(im2,n1,kmul(im1,ksub(n2,ltet2))),knmsub(Ro311,kmadd(im3,n1,kmul(im1,ksub(n3,ltet3))),knmsub(Ro321,kmadd(im3,n2,kmul(im2,ksub(n3,ltet3))),kmadd(Ro121,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro131,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmul(Ro231,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)))))))))))),kmadd(ltet2,kmadd(im3,kmadd(nn,kmul(Ro332,kmadd(n3,ToReal(-2),ltet3)),kmadd(R4p1223,kmsub(ltet1,n2,kmul(ltet2,n1)),kmadd(R4p1323,kmsub(ltet1,n3,kmul(ltet3,n1)),kmul(R4p2323,kmsub(ltet2,n3,kmul(ltet3,n2)))))),kmadd(im1,kmadd(nn,kmul(Ro112,kmadd(n1,ToReal(-2),ltet1)),kmadd(R4p1212,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1213,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1223,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmul(nn,kmadd(im2,kmul(Ro222,kmadd(n2,ToReal(-2),ltet2)),knmsub(Ro312,kmadd(im3,n1,kmul(im1,ksub(n3,ltet3))),knmsub(Ro322,kmadd(im3,n2,kmul(im2,ksub(n3,ltet3))),kmadd(Ro122,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro132,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmadd(Ro212,kmsub(im1,ksub(ltet2,n2),kmul(im2,n1)),kmul(Ro232,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)))))))))))),kmul(ltet3,kmadd(im1,kmadd(nn,kmul(Ro113,kmadd(n1,ToReal(-2),ltet1)),kmadd(R4p1213,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1313,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p1323,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmadd(im2,kmadd(nn,kmul(Ro223,kmadd(n2,ToReal(-2),ltet2)),kmadd(R4p1223,kmsub(ltet2,n1,kmul(ltet1,n2)),kmadd(R4p1323,kmsub(ltet3,n1,kmul(ltet1,n3)),kmul(R4p2323,kmsub(ltet3,n2,kmul(ltet2,n3)))))),kmul(nn,kmadd(im3,kmul(Ro333,kmadd(n3,ToReal(-2),ltet3)),knmsub(Ro213,kmadd(im2,n1,kmul(im1,ksub(n2,ltet2))),kmadd(Ro123,kmsub(im2,ksub(ltet1,n1),kmul(im1,n2)),kmadd(Ro133,kmsub(im3,ksub(ltet1,n1),kmul(im1,n3)),kmadd(Ro233,kmsub(im3,ksub(ltet2,n2),kmul(im2,n3)),kmadd(Ro313,kmsub(im1,ksub(ltet3,n3),kmul(im3,n1)),kmul(Ro323,kmsub(im2,ksub(ltet3,n3),kmul(im3,n2))))))))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi0rL = 
+    CCTK_REAL_VEC Psi0rL CCTK_ATTRIBUTE_UNUSED = 
       knmsub(kmadd(R4p1212,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet3,ltet3),kmul(ltet1,kmul(ltet3,kmul(R4p1223,ToReal(-2)))))),kmsub(im2,im2,kmul(rm2,rm2)),knmsub(kmul(nn,nn),kmadd(im1,kmadd(im2,kadd(Rojo12,Rojo21),kmul(im3,kadd(Rojo13,Rojo31))),knmsub(rm1,kmadd(rm2,kadd(Rojo12,Rojo21),kmul(rm3,kadd(Rojo13,Rojo31))),kmadd(Rojo23,kmsub(im2,im3,kmul(rm2,rm3)),kmadd(Rojo32,kmsub(im2,im3,kmul(rm2,rm3)),kmadd(Rojo11,kmsub(im1,im1,kmul(rm1,rm1)),kmadd(Rojo22,kmsub(im2,im2,kmul(rm2,rm2)),kmul(Rojo33,kmsub(im3,im3,kmul(rm3,rm3))))))))),kmsub(kmadd(kmsub(ltet1,kmadd(ltet2,R4p1212,kmul(ltet3,R4p1213)),kmul(ltet3,kmadd(ltet2,R4p1223,kmul(ltet3,R4p1323)))),kmsub(im1,im2,kmul(rm1,rm2)),kmadd(kmadd(ltet1,kmul(ltet2,R4p1213),kmadd(ltet1,kmul(ltet3,R4p1313),kmadd(ltet2,kmul(ltet3,R4p1323),kmul(R4p1223,kmul(ltet2,ltet2))))),kmsub(im1,im3,kmul(rm1,rm3)),kmadd(kmsub(rm2,rm3,kmul(im2,im3)),kmadd(R4p1213,kmul(ltet1,ltet1),kmsub(ltet1,kmsub(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet2,kmul(ltet3,R4p2323)))),kmul(nn,kmadd(kmadd(ltet1,Ro112,kmadd(ltet2,Ro122,kmul(ltet3,Ro132))),kmsub(rm1,rm2,kmul(im1,im2)),kmadd(kmadd(ltet1,Ro211,kmadd(ltet2,Ro221,kmul(ltet3,Ro231))),kmsub(rm1,rm2,kmul(im1,im2)),kmadd(kmadd(ltet1,Ro113,kmadd(ltet2,Ro123,kmul(ltet3,Ro133))),kmsub(rm1,rm3,kmul(im1,im3)),kmadd(kmadd(ltet1,Ro311,kmadd(ltet2,Ro321,kmul(ltet3,Ro331))),kmsub(rm1,rm3,kmul(im1,im3)),kmadd(kmadd(ltet1,Ro213,kmadd(ltet2,Ro223,kmul(ltet3,Ro233))),kmsub(rm2,rm3,kmul(im2,im3)),kmadd(kmadd(ltet1,Ro312,kmadd(ltet2,Ro322,kmul(ltet3,Ro332))),kmsub(rm2,rm3,kmul(im2,im3)),kmadd(kmadd(ltet1,Ro111,kmadd(ltet2,Ro121,kmul(ltet3,Ro131))),kmsub(rm1,rm1,kmul(im1,im1)),kmadd(kmadd(ltet1,Ro212,kmadd(ltet2,Ro222,kmul(ltet3,Ro232))),kmsub(rm2,rm2,kmul(im2,im2)),kmul(kmadd(ltet1,Ro313,kmadd(ltet2,Ro323,kmul(ltet3,Ro333))),kmsub(rm3,rm3,kmul(im3,im3))))))))))))))),ToReal(2),kmadd(kmsub(im3,im3,kmul(rm3,rm3)),kmadd(R4p1313,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet2,ltet2),kmul(ltet1,kmul(ltet2,kmul(R4p1323,ToReal(2)))))),kmul(kmsub(im1,im1,kmul(rm1,rm1)),kmadd(R4p1212,kmul(ltet2,ltet2),kmadd(R4p1313,kmul(ltet3,ltet3),kmul(ltet2,kmul(ltet3,kmul(R4p1213,ToReal(2)))))))))));
     
-    CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED Psi0iL = 
+    CCTK_REAL_VEC Psi0iL CCTK_ATTRIBUTE_UNUSED = 
       kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmul(kmadd(ltet1,kmadd(ltet2,R4p1213,kmul(ltet3,R4p1313)),kmadd(ltet2,kmul(ltet3,R4p1323),kmul(R4p1223,kmul(ltet2,ltet2)))),ToReal(-2)),kmadd(ToReal(2),kmadd(im2,kmul(rm2,kmadd(R4p1212,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet3,ltet3),kmul(ltet1,kmul(ltet3,kmul(R4p1223,ToReal(-2))))))),kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmsub(ltet3,kmadd(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet1,kmadd(ltet2,R4p1212,kmul(ltet3,R4p1213)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(R4p1213,kmul(ltet1,ltet1),kmsub(ltet1,kmsub(ltet2,R4p1223,kmul(ltet3,R4p1323)),kmul(ltet2,kmul(ltet3,R4p2323)))),kmadd(im1,kmul(rm1,kmadd(R4p1212,kmul(ltet2,ltet2),kmadd(R4p1313,kmul(ltet3,ltet3),kmul(ltet2,kmul(ltet3,kmul(R4p1213,ToReal(2))))))),kmadd(im3,kmul(rm3,kmadd(R4p1313,kmul(ltet1,ltet1),kmadd(R4p2323,kmul(ltet2,ltet2),kmul(ltet1,kmul(ltet2,kmul(R4p1323,ToReal(2))))))),kmul(nn,kmadd(kmadd(im2,rm1,kmul(im1,rm2)),kmadd(ltet1,kadd(Ro112,Ro211),kmadd(ltet2,kadd(Ro122,Ro221),kmul(ltet3,kadd(Ro132,Ro231)))),kmadd(kmadd(im3,rm1,kmul(im1,rm3)),kmadd(ltet1,kadd(Ro113,Ro311),kmadd(ltet2,kadd(Ro123,Ro321),kmul(ltet3,kadd(Ro133,Ro331)))),kmadd(kmadd(im3,rm2,kmul(im2,rm3)),kmadd(ltet1,kadd(Ro213,Ro312),kmadd(ltet2,kadd(Ro223,Ro322),kmul(ltet3,kadd(Ro233,Ro332)))),kmul(kmadd(im1,kmul(rm1,kmadd(ltet1,Ro111,kmadd(ltet2,Ro121,kmul(ltet3,Ro131)))),kmadd(im2,kmul(rm2,kmadd(ltet1,Ro212,kmadd(ltet2,Ro222,kmul(ltet3,Ro232)))),kmul(im3,kmul(rm3,kmadd(ltet1,Ro313,kmadd(ltet2,Ro323,kmul(ltet3,Ro333))))))),ToReal(2))))))))))),kmul(kmul(nn,nn),kmadd(im1,kmadd(rm2,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo13,Rojo31),kmul(rm1,kmul(Rojo11,ToReal(2))))),kmadd(im2,kmadd(rm1,kadd(Rojo12,Rojo21),kmadd(rm3,kadd(Rojo23,Rojo32),kmul(rm2,kmul(Rojo22,ToReal(2))))),kmul(im3,kmadd(rm1,kadd(Rojo13,Rojo31),kmadd(rm2,kadd(Rojo23,Rojo32),kmul(rm3,kmul(Rojo33,ToReal(2)))))))))));
     
     /* Copy local copies back to grid functions */
diff --git a/src/make.code.defn b/src/make.code.defn
index d5c3ece..56c6ce4 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc WeylScal4_psi4_calc_Nth.cc WeylScal4_psi4_calc_2nd.cc WeylScal4_psi4_calc_4th.cc WeylScal4_psis_calc_Nth.cc WeylScal4_psis_calc_2nd.cc WeylScal4_psis_calc_4th.cc WeylScal4_invars_calc_Nth.cc WeylScal4_invars_calc_2nd.cc WeylScal4_invars_calc_4th.cc Boundaries.cc 
+SRCS = Boundaries.cc RegisterMoL.cc RegisterSymmetries.cc Startup.cc WeylScal4_invars_calc_2nd.cc WeylScal4_invars_calc_4th.cc WeylScal4_invars_calc_Nth.cc WeylScal4_psi4_calc_2nd.cc WeylScal4_psi4_calc_4th.cc WeylScal4_psi4_calc_Nth.cc WeylScal4_psis_calc_2nd.cc WeylScal4_psis_calc_4th.cc WeylScal4_psis_calc_Nth.cc
author	hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843>	2013-10-12 10:01:48 +0000
committer	hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843>	2013-10-12 10:01:48 +0000
commit	ee248b1256dc94bf10e72c19efa500272fcf2336 (patch)
tree	89efdc31747381017238fbcad54d2157a9fbdfc5
parent	0d93bcf67c8fb82991463c283922f89cddd3394a (diff)