Index: tests/meta/.expect/arch.arm64.txt
===================================================================
--- tests/meta/.expect/arch.arm64.txt	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
+++ tests/meta/.expect/arch.arm64.txt	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
@@ -0,0 +1,53 @@
+meta/arch.cfa:28:1 error: Cannot choose between 3 alternatives for expression
+Explicit Cast of:
+  Name: FA64
+... to:
+  char
+... with resolved type:
+  char Alternatives are:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FA64: double
+      ... with resolved type:
+        double
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FA64: function
+        accepting unspecified arguments
+      ... returning nothing
+
+      ... with resolved type:
+        pointer to function
+          accepting unspecified arguments
+        ... returning nothing
+
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FA64: signed int
+      ... with resolved type:
+        signed int
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+
Index: tests/meta/.expect/arch.x64.txt
===================================================================
--- tests/meta/.expect/arch.x64.txt	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
+++ tests/meta/.expect/arch.x64.txt	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
@@ -0,0 +1,53 @@
+meta/arch.cfa:28:1 error: Cannot choose between 3 alternatives for expression
+Explicit Cast of:
+  Name: FX64
+... to:
+  char
+... with resolved type:
+  char Alternatives are:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX64: double
+      ... with resolved type:
+        double
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX64: function
+        accepting unspecified arguments
+      ... returning nothing
+
+      ... with resolved type:
+        pointer to function
+          accepting unspecified arguments
+        ... returning nothing
+
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX64: signed int
+      ... with resolved type:
+        signed int
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+
Index: tests/meta/.expect/arch.x86.txt
===================================================================
--- tests/meta/.expect/arch.x86.txt	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
+++ tests/meta/.expect/arch.x86.txt	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
@@ -0,0 +1,53 @@
+meta/arch.cfa:28:1 error: Cannot choose between 3 alternatives for expression
+Explicit Cast of:
+  Name: FX86
+... to:
+  char
+... with resolved type:
+  char Alternatives are:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX86: double
+      ... with resolved type:
+        double
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX86: function
+        accepting unspecified arguments
+      ... returning nothing
+
+      ... with resolved type:
+        pointer to function
+          accepting unspecified arguments
+        ... returning nothing
+
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX86: signed int
+      ... with resolved type:
+        signed int
+    ... to:
+      char
+    ... with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
+
Index: tests/meta/.expect/archVast.nast.arm64.txt
===================================================================
--- tests/meta/.expect/archVast.nast.arm64.txt	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,53 +1,0 @@
-meta/archVast.cfa:28:1 error: Cannot choose between 3 alternatives for expression
-Explicit Cast of:
-  Name: FA64
-... to:
-  char
-... with resolved type:
-  char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: double
-      ... with resolved type:
-        double
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: function
-        accepting unspecified arguments
-      ... returning nothing
-
-      ... with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: signed int
-      ... with resolved type:
-        signed int
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-
Index: tests/meta/.expect/archVast.nast.x64.txt
===================================================================
--- tests/meta/.expect/archVast.nast.x64.txt	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,53 +1,0 @@
-meta/archVast.cfa:28:1 error: Cannot choose between 3 alternatives for expression
-Explicit Cast of:
-  Name: FX64
-... to:
-  char
-... with resolved type:
-  char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: double
-      ... with resolved type:
-        double
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: function
-        accepting unspecified arguments
-      ... returning nothing
-
-      ... with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: signed int
-      ... with resolved type:
-        signed int
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-
Index: tests/meta/.expect/archVast.nast.x86.txt
===================================================================
--- tests/meta/.expect/archVast.nast.x86.txt	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,53 +1,0 @@
-meta/archVast.cfa:28:1 error: Cannot choose between 3 alternatives for expression
-Explicit Cast of:
-  Name: FX86
-... to:
-  char
-... with resolved type:
-  char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: double
-      ... with resolved type:
-        double
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: function
-        accepting unspecified arguments
-      ... returning nothing
-
-      ... with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: signed int
-      ... with resolved type:
-        signed int
-    ... to:
-      char
-    ... with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-
Index: tests/meta/.expect/archVast.oast.arm64.txt
===================================================================
--- tests/meta/.expect/archVast.oast.arm64.txt	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,53 +1,0 @@
-meta/archVast.cfa:28:1 error: Cannot choose between 3 alternatives for expression
-Explicit Cast of:
-  Name: FA64
-... to:
-  char
-with resolved type:
-  char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: function
-        accepting unspecified arguments
-      ... returning nothing
-
-      with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: double
-      with resolved type:
-        double
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: signed int
-      with resolved type:
-        signed int
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-
Index: tests/meta/.expect/archVast.oast.x64.txt
===================================================================
--- tests/meta/.expect/archVast.oast.x64.txt	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,53 +1,0 @@
-meta/archVast.cfa:28:1 error: Cannot choose between 3 alternatives for expression
-Explicit Cast of:
-  Name: FX64
-... to:
-  char
-with resolved type:
-  char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: double
-      with resolved type:
-        double
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: function
-        accepting unspecified arguments
-      ... returning nothing
-
-      with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: signed int
-      with resolved type:
-        signed int
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-
Index: tests/meta/.expect/archVast.oast.x86.txt
===================================================================
--- tests/meta/.expect/archVast.oast.x86.txt	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,53 +1,0 @@
-meta/archVast.cfa:28:1 error: Cannot choose between 3 alternatives for expression
-Explicit Cast of:
-  Name: FX86
-... to:
-  char
-with resolved type:
-  char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: double
-      with resolved type:
-        double
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: function
-        accepting unspecified arguments
-      ... returning nothing
-
-      with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: signed int
-      with resolved type:
-        signed int
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-
Index: tests/meta/arch.cfa
===================================================================
--- tests/meta/arch.cfa	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
+++ tests/meta/arch.cfa	(revision 8b95babb29b4d6acac515bb984fc52956b54052f)
@@ -0,0 +1,32 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// arch.cfa -- Check if all architectures are properly distinguished by the test suite
+//
+// Author           : Thierry Delisle
+// Created On       : Tue Nov 03 15:04:53 2020
+// Last Modified By :
+// Last Modified On :
+// Update Count     :
+//
+
+#if defined( __i386 )
+#define NAME FX86
+#elif defined( __x86_64 )
+#define NAME FX64
+#elif defined( __aarch64__ )
+#define NAME FA64
+#endif
+
+int NAME;
+void NAME() {
+	int NAME;
+	double NAME;
+	(char)NAME;
+	(int(*)())NAME;
+}
+
+int main() {}
Index: tests/meta/archVast.cfa
===================================================================
--- tests/meta/archVast.cfa	(revision 0521a1ac3f698a07991505c415764e42aef92b53)
+++ 	(revision )
@@ -1,32 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// archVast.cfa -- Check if all combinations are of ast/arch are properly distinguished
-//
-// Author           : Thierry Delisle
-// Created On       : Tue Nov 03 15:04:53 2020
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
-//
-
-#if defined( __i386 )
-#define NAME FX86
-#elif defined( __x86_64 )
-#define NAME FX64
-#elif defined( __aarch64__ )
-#define NAME FA64
-#endif
-
-int NAME;
-void NAME() {
-	int NAME;
-	double NAME;
-	(char)NAME;
-	(int(*)())NAME;
-}
-
-int main() {}