Index: src/Concurrency/Waituntil.cpp
===================================================================
--- src/Concurrency/Waituntil.cpp	(revision d923fca679790b81e32b6a12debf586d34a17e72)
+++ src/Concurrency/Waituntil.cpp	(revision 3151bc098c7455c35a93a8f6de9f47dc4f0a07eb)
@@ -9,7 +9,7 @@
 // Author           : Andrew Beach
 // Created On       : Fri May 27 10:31:00 2022
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun 13 13:30:00 2022
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Nov 23 22:37:39 2025
+// Update Count     : 3
 //
 
@@ -606,5 +606,5 @@
 
 	// Generates: register_select(A, clause1);
-	currBody->push_back( new ExprStmt( loc, genSelectTraitCall( clause, data, "register_select" ) ) );
+	currBody->push_back( new ExprStmt( loc, genSelectTraitCall( clause, data, "register_select$" ) ) );
 
 	// generates: if ( when_cond ) { ... currBody ... }
@@ -638,5 +638,5 @@
 		{
 			new IfStmt( cLoc,
-				genSelectTraitCall( clause, data, "on_selected" ),
+				genSelectTraitCall( clause, data, "on_selected$" ),
 				ast::deepCopy( clause->stmt )
 			)
@@ -715,5 +715,5 @@
 				                                )
 				                            ),
-				                            new ExprStmt( loc, genSelectTraitCall( clause, clauseData.at(idx), "unregister_select" ) )
+				                            new ExprStmt( loc, genSelectTraitCall( clause, clauseData.at(idx), "unregister_select$" ) )
 				                        }
 				                    )
@@ -1017,5 +1017,5 @@
 	const CodeLocation & cLoc = stmt->clauses.at(idx)->location;
 
-	Expr * baseCond = genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" );
+	Expr * baseCond = genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select$" );
 	Expr * ifCond;
 
@@ -1150,5 +1150,5 @@
 			new IfStmt( cLoc,
 				ifCond,
-				new ExprStmt( cLoc, genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select" ) )
+				new ExprStmt( cLoc, genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select$" ) )
 			)
 		);
@@ -1343,5 +1343,5 @@
 			),
 			new CastExpr( cLoc,
-				genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select" ),
+				genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select$" ),
 				new BasicType( BasicKind::Bool ), GeneratedFlag::ExplicitCast
 			),
@@ -1372,5 +1372,5 @@
 				    {
 				        new IfStmt( cLoc,
-				            genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "on_selected" ),
+				            genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "on_selected$" ),
 				            ast::deepCopy( stmt->clauses.at(i)->stmt )
 				        )