Index: tests/coroutine/.in/fmtLines.txt
===================================================================
--- tests/coroutine/.in/fmtLines.txt	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/.in/fmtLines.txt	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -35,5 +35,5 @@
 			for ( fmt.b = 0; fmt.b < 4; fmt.b += 1 ) {	// blocks of 4 characters
 				for ( ;; ) {							// for newline characters
-					suspend();
+					suspend;
 					if ( fmt.ch != '\n' ) break;		// ignore newline
 				} // for
Index: tests/coroutine/cntparens.cfa
===================================================================
--- tests/coroutine/cntparens.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/cntparens.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
+//
 // cntparens.cfa -- match left/right parenthesis
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Sat Apr 20 11:04:45 2019
@@ -12,5 +12,5 @@
 // Last Modified On : Sat Apr 20 11:06:21 2019
 // Update Count     : 1
-// 
+//
 
 #include <fstream.hfa>
@@ -26,12 +26,12 @@
 void main( CntParens & cpns ) with( cpns ) {
 	for ( ; ch == '('; cnt += 1 ) {						// left parenthesis
-		suspend();
+		suspend;
 	}
 	for ( ; ch == ')' && cnt > 1; cnt -= 1 ) {			// right parenthesis
-		suspend();
+		suspend;
 	}
 	status = ch == ')' ? Match : Error;
 } // main
-	
+
 void ?{}( CntParens & cpns ) with( cpns ) { status = Cont; cnt = 0; }
 
Index: tests/coroutine/devicedriver.cfa
===================================================================
--- tests/coroutine/devicedriver.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/devicedriver.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// devicedriver.cfa -- 
-// 
+//
+// devicedriver.cfa --
+//
 // Author           : Peter A. Buhr
 // Created On       : Sat Mar 16 15:30:34 2019
@@ -12,5 +12,5 @@
 // Last Modified On : Sat Apr 20 09:07:19 2019
 // Update Count     : 90
-// 
+//
 
 #include <fstream.hfa>
@@ -29,7 +29,7 @@
 
 void checkCRC( Driver & d, unsigned int sum ) with( d ) {
-	suspend();
+	suspend;
 	unsigned short int crc = byte << 8;					// sign extension over written
-	suspend();
+	suspend;
 	// prevent sign extension for signed char
 	status = (crc | (unsigned char)byte) == sum ? MSG : ECRC;
@@ -41,17 +41,17 @@
 		status = CONT;
 		unsigned int lnth = 0, sum = 0;
-		while ( byte != STX ) suspend();
+		while ( byte != STX ) suspend;
 	  emsg: for () {
-			suspend();
+			suspend;
 			choose ( byte ) {							// process byte
 			  case STX:
-				status = ESTX; suspend(); continue msg;
+				status = ESTX; suspend; continue msg;
 			  case ETX:
 				break emsg;
 			  case ESC:
-				suspend();
+				suspend;
 			} // choose
 			if ( lnth >= MaxMsg ) {						// buffer full ?
-				status = ELNTH; suspend(); continue msg;
+				status = ELNTH; suspend; continue msg;
 			} // if
 			msg[lnth++] = byte;
@@ -60,5 +60,5 @@
 		msg[lnth] = '\0';								// terminate string
 		checkCRC( d, sum );								// refactor CRC check
-		suspend();
+		suspend;
 	} // for
 } // main
Index: tests/coroutine/fibonacci.cfa
===================================================================
--- tests/coroutine/fibonacci.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/fibonacci.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -22,10 +22,10 @@
 	int fn1, fn2;										// retained between resumes
 	fn = 0;  fn1 = fn;									// 1st case
-	suspend();											// restart last resume
+	suspend;											// restart last resume
 	fn = 1;  fn2 = fn1;  fn1 = fn;						// 2nd case
-	suspend();											// restart last resume
+	suspend;											// restart last resume
 	for () {
 		fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;			// general case
-		suspend();										// restart last resume
+		suspend;										// restart last resume
 	} // for
 }
Index: tests/coroutine/fibonacci_1.cfa
===================================================================
--- tests/coroutine/fibonacci_1.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/fibonacci_1.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -12,5 +12,5 @@
 // Last Modified On : Thu Mar 21 08:10:45 2019
 // Update Count     : 25
-// 
+//
 
 #include <fstream.hfa>
@@ -23,5 +23,5 @@
 	[fn1, fn] = [0, 1];									// precompute first two states
 	for () {
-		suspend();										// restart last resume
+		suspend;										// restart last resume
 		[fn1, fn] = [fn, fn1 + fn];						// general case
 	} // for
Index: tests/coroutine/fmtLines.cfa
===================================================================
--- tests/coroutine/fmtLines.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/fmtLines.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -27,5 +27,5 @@
 			for ( b = 0; b < 4; b += 1 ) {				// blocks of 4 characters
 				for () {								// for newline characters
-					suspend();
+					suspend;
 				  if ( ch != '\n' ) break;				// ignore newline
 				} // for
Index: tests/coroutine/raii.cfa
===================================================================
--- tests/coroutine/raii.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/raii.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -39,5 +39,5 @@
 	Raii raii = { "Coroutine" };
 	sout | "Before Suspend";
-	suspend();
+	suspend;
 	sout | "After Suspend";
 }
Index: tests/coroutine/runningTotal.cfa
===================================================================
--- tests/coroutine/runningTotal.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/runningTotal.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -25,5 +25,5 @@
 void update( RunTotal & rntl, int input ) with( rntl ) { // helper
 	total += input;										// remember between activations
-	suspend();											// inactivate on stack
+	suspend;											// inactivate on stack
 }
 
Index: tests/coroutine/suspend_then.cfa
===================================================================
--- tests/coroutine/suspend_then.cfa	(revision 0c6900b3996bc8889c7f0ebcc93f3130555126b8)
+++ tests/coroutine/suspend_then.cfa	(revision 427854baeaba2d97cb23623b6d3c3ad7f7b0dbdd)
@@ -18,5 +18,5 @@
 
 void then() {
-	sout | "Then!";
+
 }
 
@@ -26,10 +26,10 @@
 	int fn1, fn2;								// retained between resumes
 	fn = 0;  fn1 = fn;							// 1st case
-	suspend_then(then);							// restart last resume
+	suspend { sout | "Then!"; }						// restart last resume
 	fn = 1;  fn2 = fn1;  fn1 = fn;					// 2nd case
-	suspend_then(then);							// restart last resume
+	suspend { sout | "Then!"; }						// restart last resume
 	for () {
 		fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;			// general case
-		suspend_then(then);						// restart last resume
+		suspend { sout | "Then!"; }					// restart last resume
 	} // for
 }