diff --git a/src/core/device.cu b/src/core/device.cu
index 8b89a78..a3db98a 100644
--- a/src/core/device.cu
+++ b/src/core/device.cu
@@ -60,6 +60,11 @@ DCONST(const AcReal3Param param)
 {
     return d_mesh_info.real3_params[param];
 }
+constexpr VertexBufferHandle
+DCONST(const VertexBufferHandle handle)
+{
+    return handle;
+}
 #define DCONST_INT(x) DCONST(x)
 #define DCONST_INT3(x) DCONST(x)
 #define DCONST_REAL(x) DCONST(x)
diff --git a/src/core/kernels/stencil_header.hh b/src/core/kernels/stencil_header.hh
index f7de1ba..31667fc 100644
--- a/src/core/kernels/stencil_header.hh
+++ b/src/core/kernels/stencil_header.hh
@@ -90,34 +90,28 @@ uniform Scalar AC_inv_dsz;
  * User-defined vertex buffers
  * =============================================================================
  */
-// clang-format off
 #if LENTROPY
-#define AC_FOR_VTXBUF_HANDLES(FUNC) \
-    FUNC(VTXBUF_LNRHO), \
-    FUNC(VTXBUF_UUX), \
-    FUNC(VTXBUF_UUY), \
-    FUNC(VTXBUF_UUZ), \
-    FUNC(VTXBUF_AX), \
-    FUNC(VTXBUF_AY), \
-    FUNC(VTXBUF_AZ), \
-    FUNC(VTXBUF_ENTROPY),
+uniform ScalarField VTXBUF_LNRHO;
+uniform ScalarField VTXBUF_UUX;
+uniform ScalarField VTXBUF_UUY;
+uniform ScalarField VTXBUF_UUZ;
+uniform ScalarField VTXBUF_AX;
+uniform ScalarField VTXBUF_AY;
+uniform ScalarField VTXBUF_AZ;
+uniform ScalarField VTXBUF_ENTROPY;
 #elif LMAGNETIC
-#define AC_FOR_VTXBUF_HANDLES(FUNC) \
-    FUNC(VTXBUF_LNRHO), \
-    FUNC(VTXBUF_UUX), \
-    FUNC(VTXBUF_UUY), \
-    FUNC(VTXBUF_UUZ), \
-    FUNC(VTXBUF_AX), \
-    FUNC(VTXBUF_AY), \
-    FUNC(VTXBUF_AZ),
+uniform ScalarField VTXBUF_LNRHO;
+uniform ScalarField VTXBUF_UUX;
+uniform ScalarField VTXBUF_UUY;
+uniform ScalarField VTXBUF_UUZ;
+uniform ScalarField VTXBUF_AX;
+uniform ScalarField VTXBUF_AY;
+uniform ScalarField VTXBUF_AZ;
 #elif LHYDRO
-#define AC_FOR_VTXBUF_HANDLES(FUNC) \
-    FUNC(VTXBUF_LNRHO), \
-    FUNC(VTXBUF_UUX), \
-    FUNC(VTXBUF_UUY), \
-    FUNC(VTXBUF_UUZ),
+uniform ScalarField VTXBUF_LNRHO;
+uniform ScalarField VTXBUF_UUX;
+uniform ScalarField VTXBUF_UUY;
+uniform ScalarField VTXBUF_UUZ;
 #else
-#define AC_FOR_VTXBUF_HANDLES(FUNC) \
-    FUNC(VTXBUF_LNRHO),
+uniform ScalarField VTXBUF_LNRHO;
 #endif
-// clang-format on