Index: tests/.expect/copyfile.txt
===================================================================
--- tests/.expect/copyfile.txt	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/.expect/copyfile.txt	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -10,6 +10,6 @@
 // Created On       : Fri Jun 19 13:44:05 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 19 17:58:03 2020
-// Update Count     : 4
+// Last Modified On : Mon Jun  5 21:20:07 2023
+// Update Count     : 5
 // 
 
@@ -30,7 +30,7 @@
 			exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]";
 		} // choose
-	} catch( Open_Failure * ex ; ex->istream == &in ) {
+	} catch( open_failure * ex ; ex->istream == &in ) {
 		exit | "Unable to open input file" | argv[1];
-	} catch( Open_Failure * ex ; ex->ostream == &out ) {
+	} catch( open_failure * ex ; ex->ostream == &out ) {
 		close( in );									// optional
 		exit | "Unable to open output file" | argv[2];
Index: tests/.in/copyfile.txt
===================================================================
--- tests/.in/copyfile.txt	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/.in/copyfile.txt	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -10,6 +10,6 @@
 // Created On       : Fri Jun 19 13:44:05 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 19 17:58:03 2020
-// Update Count     : 4
+// Last Modified On : Mon Jun  5 21:20:07 2023
+// Update Count     : 5
 // 
 
@@ -30,7 +30,7 @@
 			exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]";
 		} // choose
-	} catch( Open_Failure * ex ; ex->istream == &in ) {
+	} catch( open_failure * ex ; ex->istream == &in ) {
 		exit | "Unable to open input file" | argv[1];
-	} catch( Open_Failure * ex ; ex->ostream == &out ) {
+	} catch( open_failure * ex ; ex->ostream == &out ) {
 		close( in );									// optional
 		exit | "Unable to open output file" | argv[2];
Index: tests/concurrency/lockfree_stack.cfa
===================================================================
--- tests/concurrency/lockfree_stack.cfa	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/concurrency/lockfree_stack.cfa	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -10,6 +10,6 @@
 // Created On       : Thu May 25 15:36:50 2023
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 30 19:02:32 2023
-// Update Count     : 18
+// Last Modified On : Fri Jun  9 14:01:07 2023
+// Update Count     : 68
 // 
 
@@ -29,5 +29,5 @@
 	int64_t atom;
 	#endif // __SIZEOF_INT128__
-} __attribute__(( aligned( 16 ) ));
+};
 
 struct Node {
@@ -42,5 +42,6 @@
 	n.next = stack;										// atomic assignment unnecessary
 	for () {											// busy wait
-		if ( CASV( stack.atom, n.next.atom, ((Link){ &n, n.next.count + 1 }.atom) ) ) break; // attempt to update top node
+		Link temp{ &n, n.next.count + 1 };
+		if ( CASV( s.stack.atom, n.next.atom, temp.atom ) ) break; // attempt to update top node
 	}
 }
@@ -50,5 +51,6 @@
 	for () {											// busy wait
 		if ( t.top == NULL ) return NULL;				// empty stack ?
-		if ( CASV( stack.atom, t.atom, ((Link){ t.top->next.top, t.count }.atom) ) ) return t.top; // attempt to update top node
+		Link temp{ t.top->next.top, t.count };
+		if ( CASV( stack.atom, t.atom, temp.atom ) ) return t.top; // attempt to update top node
 	}
 }
@@ -57,11 +59,5 @@
 Stack stack;											// global stack
 
-enum { Times =
-	#if defined( __ARM_ARCH )							// ARM CASV is very slow
-	10_000
-	#else
-	1_000_000
-	#endif // __arm_64__
-};
+enum { Times = 2_000_000 };
 
 thread Worker {};
@@ -82,6 +78,5 @@
 
 	for ( i; N ) {										// push N values on stack
-		// storage must be 16-bytes aligned for cmpxchg16b
-		push( stack, *(Node *)memalign( 16, sizeof( Node ) ) );
+		push( stack, *(Node *)new() );					// must be 16-byte aligned
 	}
 	{
Index: tests/configs/.expect/parseconfig.txt
===================================================================
--- tests/configs/.expect/parseconfig.txt	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/configs/.expect/parseconfig.txt	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -12,5 +12,5 @@
 Maximum student trips: 3
 
-Open_Failure thrown when config file does not exist
+open_failure thrown when config file does not exist
 Failed to open the config file
 
Index: tests/configs/parseconfig.cfa
===================================================================
--- tests/configs/parseconfig.cfa	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/configs/parseconfig.cfa	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -66,8 +66,8 @@
 
 
-	sout | "Open_Failure thrown when config file does not exist";
+	sout | "open_failure thrown when config file does not exist";
 	try {
 		parse_config( xstr(IN_DIR) "doesnt-exist.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
-	} catch( Open_Failure * ex ) {
+	} catch( open_failure * ex ) {
 		sout | "Failed to open the config file";
 	}
Index: tests/copyfile.cfa
===================================================================
--- tests/copyfile.cfa	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/copyfile.cfa	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -10,6 +10,6 @@
 // Created On       : Fri Jun 19 13:44:05 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 15 15:00:48 2020
-// Update Count     : 6
+// Last Modified On : Mon Jun  5 21:20:19 2023
+// Update Count     : 7
 // 
 
@@ -30,7 +30,7 @@
 			exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]";
 		} // choose
-	} catch( Open_Failure * ex ; ex->istream == &in ) {
+	} catch( open_failure * ex ; ex->istream == &in ) {
 		exit | "Unable to open input file" | argv[1];
-	} catch( Open_Failure * ex ; ex->ostream == &out ) {
+	} catch( open_failure * ex ; ex->ostream == &out ) {
 		close( in );									// optional
 		exit | "Unable to open output file" | argv[2];
Index: tests/rational.cfa
===================================================================
--- tests/rational.cfa	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ tests/rational.cfa	(revision 38e266ca6862f1e0af193a04ede8b53f17361fee)
@@ -10,6 +10,6 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 20 18:13:40 2021
-// Update Count     : 107
+// Last Modified On : Mon Jun  5 22:58:09 2023
+// Update Count     : 108
 //
 
@@ -19,5 +19,5 @@
 #include <fstream.hfa>
 
-typedef Rational(int) RatInt;
+typedef rational(int) rat_int;
 double convert( int i ) { return (double)i; }			// used by narrow/widen
 int convert( double d ) { return (int)d; }
@@ -25,24 +25,24 @@
 int main() {
 	sout | "constructor";
-	RatInt a = { 3 }, b = { 4 }, c, d = 0, e = 1;
+	rat_int a = { 3 }, b = { 4 }, c, d = 0, e = 1;
 	sout | "a : " | a | "b : " | b | "c : " | c | "d : " | d | "e : " | e;
 
-	a = (RatInt){ 4, 8 };
-	b = (RatInt){ 5, 7 };
+	a = (rat_int){ 4, 8 };
+	b = (rat_int){ 5, 7 };
 	sout | "a : " | a | "b : " | b;
-	a = (RatInt){ -2, -3 };
-	b = (RatInt){ 3, -2 };
+	a = (rat_int){ -2, -3 };
+	b = (rat_int){ 3, -2 };
 	sout | "a : " | a | "b : " | b;
-	a = (RatInt){ -2, 3 };
-	b = (RatInt){ 3, 2 };
+	a = (rat_int){ -2, 3 };
+	b = (rat_int){ 3, 2 };
 	sout | "a : " | a | "b : " | b;
 	sout | nl;
 
 	sout | "comparison";
-	a = (RatInt){ -2 };
-	b = (RatInt){ -3, 2 };
+	a = (rat_int){ -2 };
+	b = (rat_int){ -3, 2 };
 	sout | "a : " | a | "b : " | b;
-	sout | "a == 0 : " | a == (Rational(int)){0}; // FIX ME
-	sout | "a == 1 : " | a == (Rational(int)){1}; // FIX ME
+	sout | "a == 0 : " | a == (rational(int)){0}; // FIX ME
+	sout | "a == 1 : " | a == (rational(int)){1}; // FIX ME
 	sout | "a != 0 : " | a != 0;
 	sout | "! a : " | ! a;
@@ -73,9 +73,9 @@
 
 	sout | "conversion";
-	a = (RatInt){ 3, 4 };
+	a = (rat_int){ 3, 4 };
 	sout | widen( a );
-	a = (RatInt){ 1, 7 };
+	a = (rat_int){ 1, 7 };
 	sout | widen( a );
-	a = (RatInt){ 355, 113 };
+	a = (rat_int){ 355, 113 };
 	sout | widen( a );
 	sout | narrow( 0.75, 4 );
@@ -90,5 +90,5 @@
 
 	sout | "more tests";
-	RatInt x = { 1, 2 }, y = { 2 };
+	rat_int x = { 1, 2 }, y = { 2 };
 	sout | x - y;
 	sout | x > y;
@@ -96,12 +96,12 @@
 	sout | y | denominator( y, -2 ) | y;
 
-	RatInt z = { 0, 5 };
+	rat_int z = { 0, 5 };
 	sout | z;
 
 	sout | x | numerator( x, 0 ) | x;
 
-	x = (RatInt){ 1, MAX } + (RatInt){ 1, MAX };
+	x = (rat_int){ 1, MAX } + (rat_int){ 1, MAX };
 	sout | x;
-	x = (RatInt){ 3, MAX } + (RatInt){ 2, MAX };
+	x = (rat_int){ 3, MAX } + (rat_int){ 2, MAX };
 	sout | x;
 
Index: tests/zombies/simplePoly.c
===================================================================
--- tests/zombies/simplePoly.c	(revision 1db6d707c9c3bb51aa52503723989ef9490a8c10)
+++ 	(revision )
@@ -1,34 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// simplePoly.c -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  8 22:06:41 2016
-// Update Count     : 3
-//
-
-forall( T, U | { T f( T, U ); } )
-T q( T t, U u ) {
-	return f( t, u );
-//  return t;
-}
-
-int f( int, double* );
-
-void g( void ) {
-	int y;
-	double x;
-//  if ( y )
-	q( 3, &x );
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa simplePoly.c" //
-// End: //