Index: tests/concurrent/waitfor/parse2.cfa
===================================================================
--- tests/concurrent/waitfor/parse2.cfa	(revision f8cd310f8a2e04f07eba9dbf60597d9236e4932f)
+++ tests/concurrent/waitfor/parse2.cfa	(revision a254fa566143f6cb0e0b21fd04fa574bca33042a)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 30 17:53:29 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 22 13:42:11 2019
-// Update Count     : 3
+// Last Modified On : Thu Jan 16 23:13:37 2020
+// Update Count     : 6
 // 
 
@@ -26,5 +26,5 @@
 	}
 
-	waitfor( x, z ) {
+	waitfor( x : z ) {
 	}
 
@@ -37,5 +37,5 @@
 	or waitfor( y );
 
-	waitfor( x, z );
+	waitfor( x : z );
 	or waitfor( y );
 
@@ -43,5 +43,5 @@
 	or when( true ) waitfor( y );
 
-	when( true ) waitfor( x, z );
+	when( true ) waitfor( x : z );
 	or when( true ) waitfor( y );
 
@@ -50,5 +50,5 @@
 	}
 
-	waitfor( x, z ) {
+	waitfor( x : z ) {
 	} or waitfor( y ) {
 	}
@@ -80,5 +80,5 @@
 	or else;
 
-	when( true ) waitfor( x, z );
+	when( true ) waitfor( x : z );
 	or else;
 
@@ -99,5 +99,5 @@
 	}
 
-	when( true ) waitfor( x, z );
+	when( true ) waitfor( x : z );
 	or else {
 	}
@@ -115,5 +115,5 @@
 	or when( true ) else;
 
-	when( true ) waitfor( x, z );
+	when( true ) waitfor( x : z );
 	or when( true ) else;
 
@@ -134,5 +134,5 @@
 	}
 
-	when( true ) waitfor( x, z );
+	when( true ) waitfor( x : z );
 	or when( true ) else {
 	}
@@ -149,5 +149,5 @@
 	or timeout( 3 );
 
-	waitfor( x, z );
+	waitfor( x : z );
 	or timeout( 3 );
 
@@ -163,5 +163,5 @@
 	}
 
-	when( true ) waitfor( x, z ) {
+	when( true ) waitfor( x : z ) {
 	} or timeout( 3 ) {
 	}
@@ -171,5 +171,5 @@
 	}
 
-	when( true ) waitfor( x, z ) {
+	when( true ) waitfor( x : z ) {
 	} or when ( true ) timeout( 3 ) {
 	}
@@ -229,12 +229,12 @@
 
 	int or, timeout;
-	waitfor( timeout, 7 ) 3;
-	waitfor( timeout, 7 ) 3; or waitfor( timeout, 7 ) 3;
-	when( or ) waitfor( or, ) { 4; } or timeout( 1 ) 3;
-	when( 3 ) waitfor( or, 2 ) 4; or else 4;
-	when( 3 ) waitfor( or, 3 ) 4; or when( or ) timeout( or ) 4; or when( or ) else timeout;
-	when( 3 ) waitfor( or, or ) 3; or when( or ) waitfor( or, timeout ) 4; or else 4;
-	when( 3 ) waitfor( or, or ) 3; or waitfor( or, 9 ) 4; or when( or ) timeout( timeout ) 4;
-	when( 3 ) waitfor( or, 3 ) 3; or waitfor( or, 7 ) or; or timeout( 1 ) or; or when( 3 ) else or;
+	waitfor( timeout : 7 ) 3;
+	waitfor( timeout : 7 ) 3; or waitfor( timeout : 7 ) 3;
+	when( or ) waitfor( or : ) { 4; } or timeout( 1 ) 3;
+	when( 3 ) waitfor( or : 2 ) 4; or else 4;
+	when( 3 ) waitfor( or : 3 ) 4; or when( or ) timeout( or ) 4; or when( or ) else timeout;
+	when( 3 ) waitfor( or : or ) 3; or when( or ) waitfor( or : timeout ) 4; or else 4;
+	when( 3 ) waitfor( or : or ) 3; or waitfor( or : 9 ) 4; or when( or ) timeout( timeout ) 4;
+	when( 3 ) waitfor( or : 3 ) 3; or waitfor( or : 7 ) or; or timeout( 1 ) or; or when( 3 ) else or;
 
 	// test else selection