Index: tests/expression.cfa
===================================================================
--- tests/expression.cfa	(revision 0f5da650ab6bd99405e5d9d713898351f76df3cf)
+++ tests/expression.cfa	(revision 3ecfa1375dc1c82c8e9016c410bf10d133ebda26)
@@ -1,4 +1,4 @@
 struct S { int i; };
-void ?{}( S & s, int i ) {}
+void ?{}( S & s, int i ) { s.i = i; }
 int ?`mary( int );
 int ?`mary( S );
@@ -10,11 +10,11 @@
     int a[3] = { 0, 0, 0 };
     S s = { 3 }, * ps = &s;
-    [int] t;
+    [int] t = { 3 };
     * [int] pt = &t;
-    int i = 3, j = 4;
+    int i = 1, j = 2;
 
     // operators
 
-    ! i;
+    !i;
     ~i;
     +i;
@@ -26,39 +26,39 @@
     ps--;
 
-    i+j;
-    i-j;
-    i*j;
+    i + j;
+    i - j;
+    i * j;
 
-    i/j;
-    i%j;
-    i^j;
-    i&j;
-    i|j;
-    i<j;
-    i>j;
-    i=j;
+    i / j;
+    i % j;
+    i ^ j;
+    i & j;
+    i | j;
+    i < j;
+    i > j;
+    i = j;
 
-    i==j;
-    i!=j;
-    i<<j;
-    i>>j;
-    i<=j;
-    i>=j;
-    i&&j;
-    i||j;
+    i == j;
+    i != j;
+    i << j;
+    i >> j;
+    i <= j;
+    i >= j;
+    i && j;
+    i || j;
     ps->i;
 
-    i*=j;
-    i/=j;
-    i%=j;
-    i+=j;
-    i-=j;
-    i&=j;
-    i|=j;
-    i^=j;
-    i<<=j;
-    i>>=j;
+    i *= j;
+    i /= j;
+    i %= j;
+    i += j;
+    i -= j;
+    i &= j;
+    i |= j;
+    i ^= j;
+    i <<= j;
+    i >>= j;
 
-    i?i:j;
+    i ? i : j;
 
     // postfix function call
Index: tests/labelledExit.cfa
===================================================================
--- tests/labelledExit.cfa	(revision 0f5da650ab6bd99405e5d9d713898351f76df3cf)
+++ tests/labelledExit.cfa	(revision 3ecfa1375dc1c82c8e9016c410bf10d133ebda26)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 10 07:29:39 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Oct 25 17:41:51 2019
-// Update Count     : 7
+// Last Modified On : Wed Feb  5 16:49:48 2020
+// Update Count     : 9
 // 
 
@@ -162,11 +162,11 @@
 
 	// computed goto
-	// {
-	// 	void *array[] = { &&foo, &&bar, &&hack };
-	//   foo: bar: hack:
-	// 	&&foo;
-	// 	&&bar;
-	// 	goto *array[i];
-	// }
+	{
+		void *array[] = { &&foo, &&bar, &&hack };
+	  foo: bar: hack:
+		&&foo;
+		&&bar;
+		goto *array[i];
+	}
 
   Q: if ( i > 5 ) {
Index: tests/quotedKeyword.cfa
===================================================================
--- tests/quotedKeyword.cfa	(revision 0f5da650ab6bd99405e5d9d713898351f76df3cf)
+++ tests/quotedKeyword.cfa	(revision 3ecfa1375dc1c82c8e9016c410bf10d133ebda26)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 00:02:22 2020
-// Update Count     : 24
+// Last Modified On : Fri Feb  7 19:07:07 2020
+// Update Count     : 25
 //
 
@@ -17,29 +17,29 @@
 
 struct {
-	int ``otype``;
-	int ``struct``;
+	int ``otype;
+	int ``struct;
 } st = { 10, 10 };
 
-typedef int ``forall``;
-``forall`` xxx = 10;
+typedef int ``forall;
+``forall xxx = 10;
 
-int ``_Alignas``, ``_Alignof``, ``__alignof``, ``__alignof__``, ``asm``, ``__asm``, ``__asm__``, ``_At``, ``_Atomic``, ``__attribute``,
-	``__attribute__``, ``auto``, ``_Bool``, ``break``, ``case``, ``catch``, ``catchResume``, ``char``, ``choose``, ``_Complex``, ``__complex``,
-	``__complex__``, ``const``, ``__const``, ``__const__``, ``continue``, ``default``, ``disable``, ``do``, ``double``, ``dtype``, ``else``,
-	``enable``, ``enum``, ``__extension__``, ``extern``, ``fallthru``, ``finally``, ``float``, ``__float128``, ``for``, ``forall``, ``fortran``,
-	``ftype``, ``_Generic``, ``goto``, ``if``, ``_Imaginary``, ``__imag``, ``__imag__``, ``inline``, ``__inline``, ``__inline__``, ``int``,
-	``__int128``, ``__label__``, ``long``, ``lvalue``, ``_Noreturn``, ``__builtin_offsetof``, ``otype``, ``register``, ``restrict``,
-	``__restrict``, ``__restrict__``, ``return``, ``short``, ``signed``, ``__signed``, ``__signed__``, ``sizeof``, ``static``,
-	``_Static_assert``, ``struct``, ``switch``, ``_Thread_local``, ``throw``, ``throwResume``, ``trait``, ``try``, ``typedef``,
-	``typeof``, ``__typeof``, ``__typeof__``, ``union``, ``unsigned``, ``__builtin_va_list``, ``void``, ``volatile``, ``__volatile``,
-	``__volatile__``, ``while``;
+int ``_Alignas, ``_Alignof, ``__alignof, ``__alignof__, ``asm, ``__asm, ``__asm__, ``_At, ``_Atomic, ``__attribute,
+	``__attribute__, ``auto, ``_Bool, ``break, ``case, ``catch, ``catchResume, ``char, ``choose, ``_Complex, ``__complex,
+	``__complex__, ``const, ``__const, ``__const__, ``continue, ``default, ``disable, ``do, ``double, ``dtype, ``else,
+	``enable, ``enum, ``__extension__, ``extern, ``fallthru, ``finally, ``float, ``__float128, ``for, ``forall, ``fortran,
+	``ftype, ``_Generic, ``goto, ``if, ``_Imaginary, ``__imag, ``__imag__, ``inline, ``__inline, ``__inline__, ``int,
+	``__int128, ``__label__, ``long, ``lvalue, ``_Noreturn, ``__builtin_offsetof, ``otype, ``register, ``restrict,
+	``__restrict, ``__restrict__, ``return, ``short, ``signed, ``__signed, ``__signed__, ``sizeof, ``static,
+	``_Static_assert, ``struct, ``switch, ``_Thread_local, ``throw, ``throwResume, ``trait, ``try, ``typedef,
+	``typeof, ``__typeof, ``__typeof__, ``union, ``unsigned, ``__builtin_va_list, ``void, ``volatile, ``__volatile,
+	``__volatile__, ``while;
 
 int main() {
-	int ``if`` = 0;
-	``catch`` = 1;
-	st.``otype`` = 2;
-	st.``struct`` = 3;
-	``throw`` = 4;
-	sout | ``catch`` + st.``otype`` + st.``struct`` + ``throw``;
+	int ``if = 0;
+	``catch = 1;
+	st.``otype = 2;
+	st.``struct = 3;
+	``throw = 4;
+	sout | ``catch + st.``otype + st.``struct + ``throw;
 }