Index: tests/zombies/hashtable.cfa
===================================================================
--- tests/zombies/hashtable.cfa	(revision 10ef4753267823d6dcec6e823051514c6b11208b)
+++ tests/zombies/hashtable.cfa	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
@@ -71,5 +71,5 @@
         dlist(tN, tE) & bucket = buckets[ bucket_of(this, k) ];
 
-        for ( tN * item = & $tempcv_e2n(bucket`first);  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
+        for ( tN * item = & $tempcv_e2n(first( bucket ));  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
             if ( key(*item) == k ) {
                 return *item;
@@ -94,5 +94,5 @@
         dlist(tN, tE) & bucket = buckets[ bucket_of(this, k) ];
 
-        for ( tN * item = & $tempcv_e2n(bucket`first);  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
+        for ( tN * item = & $tempcv_e2n(first( bucket ));  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
             if ( key(*item) == k ) {
                 remove(*item);
Index: tests/zombies/hashtable2.cfa
===================================================================
--- tests/zombies/hashtable2.cfa	(revision 10ef4753267823d6dcec6e823051514c6b11208b)
+++ tests/zombies/hashtable2.cfa	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
@@ -149,5 +149,5 @@
         dlist(request_in_ht_by_src, request) & bucket = buckets[ bucket_of(this, k) ];
 
-        for ( request_in_ht_by_src * item = & $tempcv_e2n(bucket`first);  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
+        for ( request_in_ht_by_src * item = & $tempcv_e2n(first( bucket ));  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
             if ( key(*item) == k ) {
                 return *item;
@@ -177,5 +177,5 @@
         dlist(request_in_ht_by_src, request) & bucket = buckets[ bucket_of(this, k) ];
 
-        for ( request_in_ht_by_src * item = & $tempcv_e2n(bucket`first);  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
+        for ( request_in_ht_by_src * item = & $tempcv_e2n(first( bucket ));  item != 0p;  item = & $tempcv_e2n((*item)`next) ) {
             if ( key(*item) == k ) {
                 remove(*item);
@@ -257,5 +257,5 @@
 
     // will re-implement as an actual splice
-    while ( & src_to_empty`first != 0p ) {
+    while ( & src_to_first( empty ) != 0p ) {
         insert_last( snk_to_fill_at_last, pop_first( src_to_empty ) );
     }
@@ -319,5 +319,5 @@
 
         // fill new table with old items
-        while ( & items`first != 0p ) {
+        while ( &first( items ) != 0p ) {
             put( this, pop_first( items ) );
         }
Index: tests/zombies/linked-list-perf/experiment.koad
===================================================================
--- tests/zombies/linked-list-perf/experiment.koad	(revision 10ef4753267823d6dcec6e823051514c6b11208b)
+++ tests/zombies/linked-list-perf/experiment.koad	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
@@ -144,5 +144,5 @@
         for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
                 Repeat( insert_last( lst, s[i] ) );
-                Repeat( remove( lst`first ) );
+                Repeat( remove( first( lst ) ) );
         }
         end = clock();
@@ -168,5 +168,5 @@
         for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
                 Repeat( insert_last( lst, s[i] ) );
-                Repeat( remove( lst`first ) );
+                Repeat( remove( first( lst ) ) );
         }
         end = clock();
Index: tests/zombies/linked-list-perf/mike-old.hfa
===================================================================
--- tests/zombies/linked-list-perf/mike-old.hfa	(revision 10ef4753267823d6dcec6e823051514c6b11208b)
+++ tests/zombies/linked-list-perf/mike-old.hfa	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
@@ -9,7 +9,7 @@
 // Author           : Michael Brooks
 // Created On       : Wed Apr 22 18:00:00 2020
-// Last Modified By : Michael Brooks
-// Last Modified On : Wed Apr 22 18:00:00 2020
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Apr 21 17:32:37 2025
+// Update Count     : 3
 //
 
@@ -147,5 +147,5 @@
 	}
 
-	static inline Telem & ?`first( dlist(Tnode, Telem) &l ) {
+	static inline Telem & first( dlist(Tnode, Telem) &l ) {
 		return * l.$links.next.elem;
 	}
@@ -157,5 +157,5 @@
 	#if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__))
 	static bool $validate_fwd( dlist(Tnode, Telem) & this ) {
-		Tnode * it = & $tempcv_e2n( this`first );
+		Tnode * it = & $tempcv_e2n( first( this ) );
 		if (!it) return (& this`last == 0p);
 
@@ -170,5 +170,5 @@
 	static bool $validate_rev( dlist(Tnode, Telem) & this ) {
 		Tnode * it = & $tempcv_e2n( this`last );
-		if (!it) return (& this`first == 0p);
+		if (!it) return (& first( this ) == 0p);
 
 		while( $prev_link(*it).elem ) {
@@ -176,5 +176,5 @@
 		}
 
-		return ( it == & $tempcv_e2n( this`first ) ) &&
+		return ( it == & $tempcv_e2n( first( this ) ) ) &&
 			   ( $prev_link(*it).is_terminator ) &&
 			   ( ((dlist(Tnode, Telem)*)$prev_link(*it).terminator) == &this );