diff --git a/Grid/simd/Fujitsu_A64FX_asm_double.h b/Grid/simd/Fujitsu_A64FX_asm_double.h
index 57636961..86ebba68 100644
--- a/Grid/simd/Fujitsu_A64FX_asm_double.h
+++ b/Grid/simd/Fujitsu_A64FX_asm_double.h
@@ -35,7 +35,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PREFETCH_CHIMU(A)  
 #define LOCK_GAUGE(A)  
 #define UNLOCK_GAUGE(A)  
-#define MASK_REGS                      DECLARATIONS_A64FXd(A)  
+#define MASK_REGS                      DECLARATIONS_A64FXd  
 #define COMPLEX_SIGNS(A)  
 #define LOAD64(A,B)  
 #define SAVE_RESULT(A,B)               RESULT_A64FXd(A)  
@@ -65,7 +65,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PERMUTE_DIR2                   PERM2_A64FXd  
 #define PERMUTE_DIR3                   PERM3_A64FXd  
 // DECLARATIONS
-#define DECLARATIONS_A64FXd(x)  \
+#define DECLARATIONS_A64FXd  \
     const uint64_t lut[4][8] = { \
         {4, 5, 6, 7, 0, 1, 2, 3}, \
         {2, 3, 0, 1, 6, 7, 4, 5}, \
diff --git a/Grid/simd/Fujitsu_A64FX_asm_single.h b/Grid/simd/Fujitsu_A64FX_asm_single.h
index e2d2f8ef..c846d085 100644
--- a/Grid/simd/Fujitsu_A64FX_asm_single.h
+++ b/Grid/simd/Fujitsu_A64FX_asm_single.h
@@ -35,7 +35,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PREFETCH_CHIMU(A)  
 #define LOCK_GAUGE(A)  
 #define UNLOCK_GAUGE(A)  
-#define MASK_REGS                      DECLARATIONS_A64FXf(A)  
+#define MASK_REGS                      DECLARATIONS_A64FXf  
 #define COMPLEX_SIGNS(A)  
 #define LOAD64(A,B)  
 #define SAVE_RESULT(A,B)               RESULT_A64FXf(A)  
@@ -65,7 +65,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PERMUTE_DIR2                   PERM2_A64FXf  
 #define PERMUTE_DIR3                   PERM3_A64FXf  
 // DECLARATIONS
-#define DECLARATIONS_A64FXf(x)  \
+#define DECLARATIONS_A64FXf  \
     const uint32_t lut[4][8] = { \
         {8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7}, \
         {4, 5, 6, 7, 0, 1, 2, 3, 12, 13, 14, 15, 8, 9, 10, 11}, \
diff --git a/Grid/simd/Fujitsu_A64FX_intrin_double.h b/Grid/simd/Fujitsu_A64FX_intrin_double.h
index 1bafc114..c3bb2fcc 100644
--- a/Grid/simd/Fujitsu_A64FX_intrin_double.h
+++ b/Grid/simd/Fujitsu_A64FX_intrin_double.h
@@ -35,7 +35,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PREFETCH_CHIMU(A)  
 #define LOCK_GAUGE(A)  
 #define UNLOCK_GAUGE(A)  
-#define MASK_REGS                      DECLARATIONS_A64FXd(A)  
+#define MASK_REGS                      DECLARATIONS_A64FXd  
 #define COMPLEX_SIGNS(A)  
 #define LOAD64(A,B)  
 #define SAVE_RESULT(A,B)               RESULT_A64FXd(A)  
@@ -65,7 +65,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PERMUTE_DIR2                   PERM2_A64FXd  
 #define PERMUTE_DIR3                   PERM3_A64FXd  
 // DECLARATIONS
-#define DECLARATIONS_A64FXd(x)  \
+#define DECLARATIONS_A64FXd  \
     const uint64_t lut[4][8] = { \
         {4, 5, 6, 7, 0, 1, 2, 3}, \
         {2, 3, 0, 1, 6, 7, 4, 5}, \
diff --git a/Grid/simd/Fujitsu_A64FX_intrin_single.h b/Grid/simd/Fujitsu_A64FX_intrin_single.h
index 57c0f978..858d287a 100644
--- a/Grid/simd/Fujitsu_A64FX_intrin_single.h
+++ b/Grid/simd/Fujitsu_A64FX_intrin_single.h
@@ -35,7 +35,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PREFETCH_CHIMU(A)  
 #define LOCK_GAUGE(A)  
 #define UNLOCK_GAUGE(A)  
-#define MASK_REGS                      DECLARATIONS_A64FXf(A)  
+#define MASK_REGS                      DECLARATIONS_A64FXf  
 #define COMPLEX_SIGNS(A)  
 #define LOAD64(A,B)  
 #define SAVE_RESULT(A,B)               RESULT_A64FXf(A)  
@@ -65,7 +65,7 @@ Author: Nils Meyer <nils.meyer@ur.de>
 #define PERMUTE_DIR2                   PERM2_A64FXf  
 #define PERMUTE_DIR3                   PERM3_A64FXf  
 // DECLARATIONS
-#define DECLARATIONS_A64FXf(x)  \
+#define DECLARATIONS_A64FXf  \
     const uint32_t lut[4][8] = { \
         {8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7}, \
         {4, 5, 6, 7, 0, 1, 2, 3, 12, 13, 14, 15, 8, 9, 10, 11}, \