Regenerate code.

Regenerate code.

Signed-off-by: Peter Diener <diener@cct.lsu.edu>

38 files changed, 276 insertions, 276 deletions

diff --git a/ML_BSSN/src/Differencing.h b/ML_BSSN/src/Differencing.h
index d7b6b5d..076e95c 100644
--- a/ML_BSSN/src/Differencing.h
+++ b/ML_BSSN/src/Differencing.h
@@ -578,38 +578,38 @@ static CCTK_REAL_VEC PDstandardNthfdOrder832_impl(CCTK_REAL const* restrict cons
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder21(u) (kmul(p1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
+#  define PDdissipationNthfdOrder21(u) (kmul(pm1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
 #else
-#  define PDdissipationNthfdOrder21(u) (PDdissipationNthfdOrder21_impl(u,p1o16dx,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder21(u) (PDdissipationNthfdOrder21_impl(u,pm1o16dx,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
+  return kmul(pm1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder22(u) (kmul(p1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
+#  define PDdissipationNthfdOrder22(u) (kmul(pm1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
 #else
-#  define PDdissipationNthfdOrder22(u) (PDdissipationNthfdOrder22_impl(u,p1o16dy,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder22(u) (PDdissipationNthfdOrder22_impl(u,pm1o16dy,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
+  return kmul(pm1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder23(u) (kmul(p1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
+#  define PDdissipationNthfdOrder23(u) (kmul(pm1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
 #else
-#  define PDdissipationNthfdOrder23(u) (PDdissipationNthfdOrder23_impl(u,p1o16dz,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder23(u) (PDdissipationNthfdOrder23_impl(u,pm1o16dz,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
+  return kmul(pm1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
 }
 #endif
 
@@ -650,38 +650,38 @@ static CCTK_REAL_VEC PDdissipationNthfdOrder43_impl(CCTK_REAL const* restrict co
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder61(u) (kmul(p1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
+#  define PDdissipationNthfdOrder61(u) (kmul(pm1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
 #else
-#  define PDdissipationNthfdOrder61(u) (PDdissipationNthfdOrder61_impl(u,p1o256dx,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder61(u) (PDdissipationNthfdOrder61_impl(u,pm1o256dx,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
+  return kmul(pm1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder62(u) (kmul(p1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
+#  define PDdissipationNthfdOrder62(u) (kmul(pm1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
 #else
-#  define PDdissipationNthfdOrder62(u) (PDdissipationNthfdOrder62_impl(u,p1o256dy,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder62(u) (PDdissipationNthfdOrder62_impl(u,pm1o256dy,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
+  return kmul(pm1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder63(u) (kmul(p1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
+#  define PDdissipationNthfdOrder63(u) (kmul(pm1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
 #else
-#  define PDdissipationNthfdOrder63(u) (PDdissipationNthfdOrder63_impl(u,p1o256dz,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder63(u) (PDdissipationNthfdOrder63_impl(u,pm1o256dz,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
+  return kmul(pm1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
 }
 #endif
 
diff --git a/ML_BSSN/src/ML_BSSN_Advect.cc b/ML_BSSN/src/ML_BSSN_Advect.cc
index d74a205..30db154 100644
--- a/ML_BSSN/src/ML_BSSN_Advect.cc
+++ b/ML_BSSN/src/ML_BSSN_Advect.cc
@@ -111,18 +111,12 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -165,6 +159,12 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_Dissipation.cc b/ML_BSSN/src/ML_BSSN_Dissipation.cc
index d2a0715..8822d79 100644
--- a/ML_BSSN/src/ML_BSSN_Dissipation.cc
+++ b/ML_BSSN/src/ML_BSSN_Dissipation.cc
@@ -111,18 +111,12 @@ static void ML_BSSN_Dissipation_Body(cGH const * restrict const cctkGH, int cons
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -165,6 +159,12 @@ static void ML_BSSN_Dissipation_Body(cGH const * restrict const cctkGH, int cons
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_InitGamma.cc b/ML_BSSN/src/ML_BSSN_InitGamma.cc
index c37ebc8..7c9f539 100644
--- a/ML_BSSN/src/ML_BSSN_InitGamma.cc
+++ b/ML_BSSN/src/ML_BSSN_InitGamma.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_InitGamma_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_InitGamma_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_InitRHS.cc b/ML_BSSN/src/ML_BSSN_InitRHS.cc
index 90a93bc..3f67829 100644
--- a/ML_BSSN/src/ML_BSSN_InitRHS.cc
+++ b/ML_BSSN/src/ML_BSSN_InitRHS.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_InitRHS_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_InitRHS_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.cc b/ML_BSSN/src/ML_BSSN_Minkowski.cc
index 812f9e1..25a960f 100644
--- a/ML_BSSN/src/ML_BSSN_Minkowski.cc
+++ b/ML_BSSN/src/ML_BSSN_Minkowski.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc
index 66a02ac..80feba6 100644
--- a/ML_BSSN/src/ML_BSSN_RHS1.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS1.cc
@@ -108,18 +108,12 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -162,6 +156,12 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_RHS2.cc b/ML_BSSN/src/ML_BSSN_RHS2.cc
index d27c0b7..7dab6b4 100644
--- a/ML_BSSN/src/ML_BSSN_RHS2.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS2.cc
@@ -87,18 +87,12 @@ static void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -141,6 +135,12 @@ static void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc b/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc
index 08fc3dd..0e6199f 100644
--- a/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc
+++ b/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc
@@ -111,18 +111,12 @@ static void ML_BSSN_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -165,6 +159,12 @@ static void ML_BSSN_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_boundary.cc b/ML_BSSN/src/ML_BSSN_boundary.cc
index e8e87b5..16240a4 100644
--- a/ML_BSSN/src/ML_BSSN_boundary.cc
+++ b/ML_BSSN/src/ML_BSSN_boundary.cc
@@ -111,18 +111,12 @@ static void ML_BSSN_boundary_Body(cGH const * restrict const cctkGH, int const d
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -165,6 +159,12 @@ static void ML_BSSN_boundary_Body(cGH const * restrict const cctkGH, int const d
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_constraints1.cc b/ML_BSSN/src/ML_BSSN_constraints1.cc
index 5c880fd..20f5f5b 100644
--- a/ML_BSSN/src/ML_BSSN_constraints1.cc
+++ b/ML_BSSN/src/ML_BSSN_constraints1.cc
@@ -87,18 +87,12 @@ static void ML_BSSN_constraints1_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -141,6 +135,12 @@ static void ML_BSSN_constraints1_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_constraints2.cc b/ML_BSSN/src/ML_BSSN_constraints2.cc
index 362f533..6493a04 100644
--- a/ML_BSSN/src/ML_BSSN_constraints2.cc
+++ b/ML_BSSN/src/ML_BSSN_constraints2.cc
@@ -96,18 +96,12 @@ static void ML_BSSN_constraints2_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -150,6 +144,12 @@ static void ML_BSSN_constraints2_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc b/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc
index 8b5be6d..1ccb41e 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, i
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, i
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
index e9db745..d56cde2 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
@@ -93,18 +93,12 @@ static void ML_BSSN_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -147,6 +141,12 @@ static void ML_BSSN_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBase.cc b/ML_BSSN/src/ML_BSSN_convertToADMBase.cc
index 36d0c7d..70159c8 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBase.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_convertToADMBase_Body(cGH const * restrict const cctkGH, int
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_convertToADMBase_Body(cGH const * restrict const cctkGH, int
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc
index d10b5d6..fa11e9b 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc
@@ -90,18 +90,12 @@ static void ML_BSSN_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -144,6 +138,12 @@ static void ML_BSSN_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc
index f50e8c2..9c7c58a 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc
@@ -90,18 +90,12 @@ static void ML_BSSN_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -144,6 +138,12 @@ static void ML_BSSN_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc
index dd877ee..9f00cc0 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_BSSN/src/ML_BSSN_enforce.cc b/ML_BSSN/src/ML_BSSN_enforce.cc
index 62f0a87..e36010f 100644
--- a/ML_BSSN/src/ML_BSSN_enforce.cc
+++ b/ML_BSSN/src/ML_BSSN_enforce.cc
@@ -75,18 +75,12 @@ static void ML_BSSN_enforce_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_BSSN_enforce_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/Differencing.h b/ML_CCZ4/src/Differencing.h
index d7b6b5d..076e95c 100644
--- a/ML_CCZ4/src/Differencing.h
+++ b/ML_CCZ4/src/Differencing.h
@@ -578,38 +578,38 @@ static CCTK_REAL_VEC PDstandardNthfdOrder832_impl(CCTK_REAL const* restrict cons
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder21(u) (kmul(p1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
+#  define PDdissipationNthfdOrder21(u) (kmul(pm1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
 #else
-#  define PDdissipationNthfdOrder21(u) (PDdissipationNthfdOrder21_impl(u,p1o16dx,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder21(u) (PDdissipationNthfdOrder21_impl(u,pm1o16dx,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder21_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
+  return kmul(pm1o16dx,kadd(KRANC_GFOFFSET3D(u,-2,0,0),kadd(KRANC_GFOFFSET3D(u,2,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder22(u) (kmul(p1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
+#  define PDdissipationNthfdOrder22(u) (kmul(pm1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
 #else
-#  define PDdissipationNthfdOrder22(u) (PDdissipationNthfdOrder22_impl(u,p1o16dy,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder22(u) (PDdissipationNthfdOrder22_impl(u,pm1o16dy,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder22_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
+  return kmul(pm1o16dy,kadd(KRANC_GFOFFSET3D(u,0,-2,0),kadd(KRANC_GFOFFSET3D(u,0,2,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder23(u) (kmul(p1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
+#  define PDdissipationNthfdOrder23(u) (kmul(pm1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.)))))))
 #else
-#  define PDdissipationNthfdOrder23(u) (PDdissipationNthfdOrder23_impl(u,p1o16dz,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder23(u) (PDdissipationNthfdOrder23_impl(u,pm1o16dz,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder23_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o16dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
+  return kmul(pm1o16dz,kadd(KRANC_GFOFFSET3D(u,0,0,-2),kadd(KRANC_GFOFFSET3D(u,0,0,2),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-4.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(6.))))));
 }
 #endif
 
@@ -650,38 +650,38 @@ static CCTK_REAL_VEC PDdissipationNthfdOrder43_impl(CCTK_REAL const* restrict co
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder61(u) (kmul(p1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
+#  define PDdissipationNthfdOrder61(u) (kmul(pm1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
 #else
-#  define PDdissipationNthfdOrder61(u) (PDdissipationNthfdOrder61_impl(u,p1o256dx,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder61(u) (PDdissipationNthfdOrder61_impl(u,pm1o256dx,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder61_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
+  return kmul(pm1o256dx,kadd(KRANC_GFOFFSET3D(u,-4,0,0),kadd(KRANC_GFOFFSET3D(u,4,0,0),kmadd(kadd(KRANC_GFOFFSET3D(u,-1,0,0),KRANC_GFOFFSET3D(u,1,0,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,-3,0,0),KRANC_GFOFFSET3D(u,3,0,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,-2,0,0),KRANC_GFOFFSET3D(u,2,0,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder62(u) (kmul(p1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
+#  define PDdissipationNthfdOrder62(u) (kmul(pm1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
 #else
-#  define PDdissipationNthfdOrder62(u) (PDdissipationNthfdOrder62_impl(u,p1o256dy,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder62(u) (PDdissipationNthfdOrder62_impl(u,pm1o256dy,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder62_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
+  return kmul(pm1o256dy,kadd(KRANC_GFOFFSET3D(u,0,-4,0),kadd(KRANC_GFOFFSET3D(u,0,4,0),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-1,0),KRANC_GFOFFSET3D(u,0,1,0)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-3,0),KRANC_GFOFFSET3D(u,0,3,0)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,-2,0),KRANC_GFOFFSET3D(u,0,2,0)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDdissipationNthfdOrder63(u) (kmul(p1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
+#  define PDdissipationNthfdOrder63(u) (kmul(pm1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.)))))))))
 #else
-#  define PDdissipationNthfdOrder63(u) (PDdissipationNthfdOrder63_impl(u,p1o256dz,cdj,cdk))
-static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ p1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+#  define PDdissipationNthfdOrder63(u) (PDdissipationNthfdOrder63_impl(u,pm1o256dz,cdj,cdk))
+static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL_VEC PDdissipationNthfdOrder63_impl(CCTK_REAL const* restrict const u, CCTK_REAL_VEC /*const*/ pm1o256dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
 {
   ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return kmul(p1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
+  return kmul(pm1o256dz,kadd(KRANC_GFOFFSET3D(u,0,0,-4),kadd(KRANC_GFOFFSET3D(u,0,0,4),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-1),KRANC_GFOFFSET3D(u,0,0,1)),ToReal(-56.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-3),KRANC_GFOFFSET3D(u,0,0,3)),ToReal(-8.),kmadd(kadd(KRANC_GFOFFSET3D(u,0,0,-2),KRANC_GFOFFSET3D(u,0,0,2)),ToReal(28.),kmul(KRANC_GFOFFSET3D(u,0,0,0),ToReal(70.))))))));
 }
 #endif
 
diff --git a/ML_CCZ4/src/ML_CCZ4_Advect.cc b/ML_CCZ4/src/ML_CCZ4_Advect.cc
index 0a1d8ca..b185afa 100644
--- a/ML_CCZ4/src/ML_CCZ4_Advect.cc
+++ b/ML_CCZ4/src/ML_CCZ4_Advect.cc
@@ -114,18 +114,12 @@ static void ML_CCZ4_Advect_Body(cGH const * restrict const cctkGH, int const dir
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -168,6 +162,12 @@ static void ML_CCZ4_Advect_Body(cGH const * restrict const cctkGH, int const dir
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_Dissipation.cc b/ML_CCZ4/src/ML_CCZ4_Dissipation.cc
index 48ebe3a..17b0951 100644
--- a/ML_CCZ4/src/ML_CCZ4_Dissipation.cc
+++ b/ML_CCZ4/src/ML_CCZ4_Dissipation.cc
@@ -114,18 +114,12 @@ static void ML_CCZ4_Dissipation_Body(cGH const * restrict const cctkGH, int cons
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -168,6 +162,12 @@ static void ML_CCZ4_Dissipation_Body(cGH const * restrict const cctkGH, int cons
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_InitGamma.cc b/ML_CCZ4/src/ML_CCZ4_InitGamma.cc
index e9a0ee8..2208bca 100644
--- a/ML_CCZ4/src/ML_CCZ4_InitGamma.cc
+++ b/ML_CCZ4/src/ML_CCZ4_InitGamma.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_InitGamma_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_InitGamma_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_InitRHS.cc b/ML_CCZ4/src/ML_CCZ4_InitRHS.cc
index 70c4903..6706a68 100644
--- a/ML_CCZ4/src/ML_CCZ4_InitRHS.cc
+++ b/ML_CCZ4/src/ML_CCZ4_InitRHS.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_InitRHS_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_InitRHS_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_Minkowski.cc b/ML_CCZ4/src/ML_CCZ4_Minkowski.cc
index afeb35b..af81c9a 100644
--- a/ML_CCZ4/src/ML_CCZ4_Minkowski.cc
+++ b/ML_CCZ4/src/ML_CCZ4_Minkowski.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_Minkowski_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_Minkowski_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_RHS1.cc b/ML_CCZ4/src/ML_CCZ4_RHS1.cc
index 472c228..0aeca46 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHS1.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHS1.cc
@@ -111,18 +111,12 @@ static void ML_CCZ4_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -165,6 +159,12 @@ static void ML_CCZ4_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_RHS2.cc b/ML_CCZ4/src/ML_CCZ4_RHS2.cc
index be21b81..a3929e2 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHS2.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHS2.cc
@@ -87,18 +87,12 @@ static void ML_CCZ4_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -141,6 +135,12 @@ static void ML_CCZ4_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc b/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc
index f638511..2ec9134 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc
@@ -114,18 +114,12 @@ static void ML_CCZ4_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -168,6 +162,12 @@ static void ML_CCZ4_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_boundary.cc b/ML_CCZ4/src/ML_CCZ4_boundary.cc
index 5eaa7a3..6534970 100644
--- a/ML_CCZ4/src/ML_CCZ4_boundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_boundary.cc
@@ -114,18 +114,12 @@ static void ML_CCZ4_boundary_Body(cGH const * restrict const cctkGH, int const d
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -168,6 +162,12 @@ static void ML_CCZ4_boundary_Body(cGH const * restrict const cctkGH, int const d
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_constraints1.cc b/ML_CCZ4/src/ML_CCZ4_constraints1.cc
index d79e218..4723ef6 100644
--- a/ML_CCZ4/src/ML_CCZ4_constraints1.cc
+++ b/ML_CCZ4/src/ML_CCZ4_constraints1.cc
@@ -87,18 +87,12 @@ static void ML_CCZ4_constraints1_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -141,6 +135,12 @@ static void ML_CCZ4_constraints1_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_constraints2.cc b/ML_CCZ4/src/ML_CCZ4_constraints2.cc
index d1a3089..1f2961d 100644
--- a/ML_CCZ4/src/ML_CCZ4_constraints2.cc
+++ b/ML_CCZ4/src/ML_CCZ4_constraints2.cc
@@ -96,18 +96,12 @@ static void ML_CCZ4_constraints2_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -150,6 +144,12 @@ static void ML_CCZ4_constraints2_Body(cGH const * restrict const cctkGH, int con
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc b/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc
index 004e119..ad6bca9 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_convertFromADMBase_Body(cGH const * restrict const cctkGH, i
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_convertFromADMBase_Body(cGH const * restrict const cctkGH, i
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc b/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
index 048bcf4..e4a91e0 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
@@ -93,18 +93,12 @@ static void ML_CCZ4_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -147,6 +141,12 @@ static void ML_CCZ4_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc
index d242b87..36f4c34 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_convertToADMBase_Body(cGH const * restrict const cctkGH, int
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_convertToADMBase_Body(cGH const * restrict const cctkGH, int
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
index 4c1d43b..db5b4d8 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
@@ -90,18 +90,12 @@ static void ML_CCZ4_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -144,6 +138,12 @@ static void ML_CCZ4_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
index 1acb283..abb0098 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
@@ -90,18 +90,12 @@ static void ML_CCZ4_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -144,6 +138,12 @@ static void ML_CCZ4_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
index 83460cd..ca07050 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);
diff --git a/ML_CCZ4/src/ML_CCZ4_enforce.cc b/ML_CCZ4/src/ML_CCZ4_enforce.cc
index 8ec94a5..9c02c5e 100644
--- a/ML_CCZ4/src/ML_CCZ4_enforce.cc
+++ b/ML_CCZ4/src/ML_CCZ4_enforce.cc
@@ -75,18 +75,12 @@ static void ML_CCZ4_enforce_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ p1o1680dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dx);
   CCTK_REAL_VEC /*const*/ p1o1680dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dy);
   CCTK_REAL_VEC /*const*/ p1o1680dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.000595238095238095238095238095238),dz);
-  CCTK_REAL_VEC /*const*/ p1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dx);
-  CCTK_REAL_VEC /*const*/ p1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dy);
-  CCTK_REAL_VEC /*const*/ p1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0625),dz);
   CCTK_REAL_VEC /*const*/ p1o180dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ p1o180dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ p1o180dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00555555555555555555555555555556),kmul(dz,dz));
   CCTK_REAL_VEC /*const*/ p1o24dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dx);
   CCTK_REAL_VEC /*const*/ p1o24dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dy);
   CCTK_REAL_VEC /*const*/ p1o24dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.0416666666666666666666666666667),dz);
-  CCTK_REAL_VEC /*const*/ p1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dx);
-  CCTK_REAL_VEC /*const*/ p1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dy);
-  CCTK_REAL_VEC /*const*/ p1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.00390625),dz);
   CCTK_REAL_VEC /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dx);
   CCTK_REAL_VEC /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dy);
   CCTK_REAL_VEC /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(0.5),dz);
@@ -129,6 +123,12 @@ static void ML_CCZ4_enforce_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));
   CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));
   CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));
+  CCTK_REAL_VEC /*const*/ pm1o16dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o16dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o16dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.0625),dz);
+  CCTK_REAL_VEC /*const*/ pm1o256dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dx);
+  CCTK_REAL_VEC /*const*/ pm1o256dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dy);
+  CCTK_REAL_VEC /*const*/ pm1o256dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.00390625),dz);
   CCTK_REAL_VEC /*const*/ pm1o2dx CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dx);
   CCTK_REAL_VEC /*const*/ pm1o2dy CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dy);
   CCTK_REAL_VEC /*const*/ pm1o2dz CCTK_ATTRIBUTE_UNUSED  = kdiv(ToReal(-0.5),dz);