Index: tests/concurrent/waituntil/channels.cfa
===================================================================
--- tests/concurrent/waituntil/channels.cfa	(revision 6e1e2d0299e4210d269f7a30ec3864a8bddceabb)
+++ tests/concurrent/waituntil/channels.cfa	(revision a882b686688032373f04d30b26f50275adec4735)
@@ -12,7 +12,7 @@
     long long int a, b, c, i = 0, myTotal = 0;
     for( ;;i++ ) {
-        when( i % 2 == 0 ) waituntil( (a << A) ) { myTotal += a; }
-        or when( i % 4 < 2 ) waituntil( (b << B) ) { myTotal += b; }
-        or waituntil( (c << C) ) { if ( c == -1 ) break; myTotal += c; }
+        when( i % 2 == 0 ) waituntil( a << A ) { myTotal += a; }
+        or when( i % 4 < 2 ) waituntil( b << B ) { myTotal += b; }
+        or waituntil( c << C ) { if ( c == -1 ) break; myTotal += c; }
         or when( i % 8 < 4 ) else {}
     }
@@ -22,9 +22,10 @@
 thread Drainer {}; // ensures that the changing when states of Server1 don't result in a deadlock
 void main( Drainer & this ) {
-    long long int a, b, c, i = 0, myTotal = 0;
-    for( ;;i++ ) {
-        waituntil( (a << A) ) { myTotal += a; }
-        or waituntil( (b << B) ) { myTotal += b; }
-        or waituntil( (c << C) ) { if ( c == -1 ) break; myTotal += c; }
+    long long int a, b, c, myTotal = 0;
+    for( ;; ) {
+        waituntil( a << A ) { myTotal += a; }
+        or waituntil( b << B ) { myTotal += b; }
+        or waituntil( c << C ) { if ( c == -1 ) break; myTotal += c; }
+        or else {}
     }
     __atomic_fetch_add( &globalTotal, myTotal, __ATOMIC_SEQ_CST );
@@ -39,9 +40,9 @@
         try_insert( B, 0 );
         try_insert( C, 0 );
-        [out, success] = try_remove(A);
+        [out, success] = try_remove( A );
         if ( success ) myTotal += out;
-        [out, success] = try_remove(B);
+        [out, success] = try_remove( B );
         if ( success ) myTotal += out;
-        [out, success] = try_remove(C);
+        [out, success] = try_remove( C );
         if ( success ) myTotal += out;
     }
@@ -68,7 +69,7 @@
             Churner c;
             for( long long int j = 0; j < numtimes; j++ ) {
-                when( j % 2 == 0 ) waituntil( (j >> A) ) { total += j; }
-                or when( j % 4 < 2 ) waituntil( (j >> B) ) { total += j; }
-                and when( j % 8 < 4 ) waituntil( (j >> C) ) { total += j; }
+                when( j % 2 == 0 ) waituntil( j >> A ) { total += j; }
+                or when( j % 4 < 2 ) waituntil( j >> B ) { total += j; }
+                and when( j % 8 < 4 ) waituntil( j >> C ) { total += j; }
             }
             done = true;
@@ -76,5 +77,5 @@
         }
         printf("waiting for empty channels\n");
-        while( get_count(A) > 0 || get_count(B) > 0 || get_count(C) > 0 ) { Pause(); }
+        while( get_count( A ) > 0 || get_count( B ) > 0 || get_count( C ) > 0 ) { }
         printf("sending sentinels\n");
         for ( i; numServers + 1 ) insert( C, -1 );