Index: tests/attributes.cfa
===================================================================
--- tests/attributes.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/attributes.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -10,6 +10,6 @@
 // Created On       : Mon Feb  6 16:07:02 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 15 13:53:31 2021
-// Update Count     : 38
+// Last Modified On : Thu Feb 23 20:33:07 2023
+// Update Count     : 39
 // 
 
@@ -22,5 +22,5 @@
 
 // aggregate_name
-struct __attribute__(( unused )) {} Dummy;
+static struct __attribute__(( unused )) {} Dummy;
 struct __attribute__(( unused )) Agn1;
 struct __attribute__(( unused )) Agn2 {};
Index: tests/concurrent/signal/disjoint.cfa
===================================================================
--- tests/concurrent/signal/disjoint.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/concurrent/signal/disjoint.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -38,5 +38,5 @@
 
 // Use a global struct because the order needs to match with Signaller thread
-struct {
+static struct {
 	global_t mut;
 	global_data_t data;
Index: tests/declarationSpecifier.cfa
===================================================================
--- tests/declarationSpecifier.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/declarationSpecifier.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 17 08:21:04 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 30 18:20:36 2019
-// Update Count     : 4
+// Last Modified On : Thu Feb 23 20:53:31 2023
+// Update Count     : 8
 //
 
@@ -25,12 +25,11 @@
 short int volatile static const x8;
 
-const volatile struct { int i; } x10;
-const struct { int i; } volatile x11;
-struct { int i; } const volatile x12;
-static const volatile struct { int i; } x13;
-const static struct { int i; } volatile x14;
-struct { int i; } static const volatile x15;
-struct { int i; } const static volatile x16;
-struct { int i; } const volatile static x17;
+static const volatile struct { int i; } x10;
+static const struct { int i; } volatile x11;
+static struct { int i; } const volatile x12;
+const static struct { int i; } volatile x13;
+struct { int i; } static const volatile x14;
+struct { int i; } const static volatile x15;
+struct { int i; } const volatile static x16;
 
 const Int volatile x20;
@@ -43,12 +42,11 @@
 Int volatile static const x27;
 
-const volatile struct { Int i; } x29;
-const struct { Int i; } volatile x30;
-struct { Int i; } const volatile x31;
-static const volatile struct { Int i; } x32;
-const static struct { Int i; } volatile x33;
-struct { Int i; } static const volatile x34;
-struct { Int i; } const static volatile x35;
-struct { Int i; } const volatile static x36;
+static const volatile struct { Int i; } x29;
+static const struct { Int i; } volatile x30;
+static struct { Int i; } const volatile x31;
+const static struct { Int i; } volatile x32;
+struct { Int i; } static const volatile x33;
+struct { Int i; } const static volatile x34;
+struct { Int i; } const volatile static x35;
 
 _Thread_local int x37;
Index: tests/forall.cfa
===================================================================
--- tests/forall.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/forall.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -10,6 +10,6 @@
 // Created On       : Wed May  9 08:48:15 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb  5 07:54:43 2023
-// Update Count     : 90
+// Last Modified On : Thu Feb 23 20:29:59 2023
+// Update Count     : 91
 //
 
@@ -195,5 +195,5 @@
 
 forall( T ) struct S { T t; } (int) x, y, z;
-forall( T ) struct { T t; } (int) a, b, c;
+static forall( T ) struct { T t; } (int) a, b, c;
 
 forall( T ) static forall( S ) {
Index: tests/io/comp_basic.cfa
===================================================================
--- tests/io/comp_basic.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/io/comp_basic.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -26,8 +26,7 @@
 #include <unistd.h>
 
-struct {
+static struct {
 	barrier & bar;
 	int pipe[2];
-
 } globals;
 
Index: tests/io/comp_fair.cfa
===================================================================
--- tests/io/comp_fair.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/io/comp_fair.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -26,5 +26,5 @@
 #include <unistd.h>
 
-struct {
+static struct {
 	barrier & bar;
 	int pipe[2];
Index: tests/quotedKeyword.cfa
===================================================================
--- tests/quotedKeyword.cfa	(revision 4074724783920776946ea2e5f6557e8cfd381943)
+++ tests/quotedKeyword.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
@@ -10,11 +10,11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  7 19:07:07 2020
-// Update Count     : 25
+// Last Modified On : Thu Feb 23 20:31:05 2023
+// Update Count     : 26
 //
 
 #include <fstream.hfa>
 
-struct {
+static struct {
 	int ``otype;
 	int ``struct;