Index: tests/concurrent/waituntil/.expect/1-chan-or-no-else.txt
===================================================================
--- tests/concurrent/waituntil/.expect/1-chan-or-no-else.txt	(revision 330b85658d56a24900d6a0bc326721d8467cc080)
+++ 	(revision )
@@ -1,5 +1,0 @@
-start
-waiting for empty channels
-sending sentinels
-joining servers
-done
Index: tests/concurrent/waituntil/.expect/2-chan-or-no-else.txt
===================================================================
--- tests/concurrent/waituntil/.expect/2-chan-or-no-else.txt	(revision 330b85658d56a24900d6a0bc326721d8467cc080)
+++ 	(revision )
@@ -1,5 +1,0 @@
-start
-waiting for empty channels
-sending sentinels
-joining servers
-done
Index: tests/concurrent/waituntil/.expect/chan-or-no-else.txt
===================================================================
--- tests/concurrent/waituntil/.expect/chan-or-no-else.txt	(revision 330b85658d56a24900d6a0bc326721d8467cc080)
+++ 	(revision )
@@ -1,5 +1,0 @@
-start
-waiting for empty channels
-sending sentinels
-joining servers
-done
Index: tests/concurrent/waituntil/.expect/one_chan.txt
===================================================================
--- tests/concurrent/waituntil/.expect/one_chan.txt	(revision 253a78ffaf6f91bf8f04bc8188716a454112fff7)
+++ tests/concurrent/waituntil/.expect/one_chan.txt	(revision 253a78ffaf6f91bf8f04bc8188716a454112fff7)
@@ -0,0 +1,5 @@
+start
+waiting for empty channels
+sending sentinels
+joining servers
+done
Index: tests/concurrent/waituntil/1-chan-or-no-else.cfa
===================================================================
--- tests/concurrent/waituntil/1-chan-or-no-else.cfa	(revision 330b85658d56a24900d6a0bc326721d8467cc080)
+++ 	(revision )
@@ -1,47 +1,0 @@
-#include <select.hfa>
-#include <thread.hfa>
-#include <channel.hfa>
-
-channel(long long int) C;
-
-volatile bool done = false;
-long long int globalTotal = 0;
-
-thread Server1 {};
-void main( Server1 & this ) {
-    long long int c, i = 0, myTotal = 0;
-    for( ;;i++ ) {
-        waituntil( c << C ) { if ( c == -1 ) break; myTotal += c; }
-    }
-    __atomic_fetch_add( &globalTotal, myTotal, __ATOMIC_SEQ_CST );
-}
-
-size_t numtimes = 100000;
-size_t numServers = 1;
-int main( int argc, char * argv[] ) {
-    if ( argc == 2 )
-        numtimes = atoi( argv[1] );
-
-    processor p[numServers];
-    C{5};
-
-    long long int total = 0;
-    printf("start\n");
-    {
-        Server1 s[numServers];
-        for( long long int j = 0; j < numtimes; j++ ) {
-            waituntil( j >> C ) { total += j; }
-        }
-        printf("waiting for empty channels\n");
-        size_t C_count = get_count( C );
-        while( C_count > 0 ) { 
-            C_count = get_count( C );
-        }
-        printf("sending sentinels\n");
-        for ( i; numServers ) insert( C, -1 );
-        printf("joining servers\n");
-    }
-    if ( total != globalTotal ) 
-        printf("CHECKSUM MISMATCH!! Main thread got %lld, server sum is %lld\n", total, globalTotal);
-    printf("done\n");
-}
Index: tests/concurrent/waituntil/one_chan.cfa
===================================================================
--- tests/concurrent/waituntil/one_chan.cfa	(revision 253a78ffaf6f91bf8f04bc8188716a454112fff7)
+++ tests/concurrent/waituntil/one_chan.cfa	(revision 253a78ffaf6f91bf8f04bc8188716a454112fff7)
@@ -0,0 +1,53 @@
+#include <select.hfa>
+#include <thread.hfa>
+#include <channel.hfa>
+
+channel(long long int) C;
+
+volatile bool done = false;
+long long int globalTotal = 0;
+
+thread Server1 {};
+void main( Server1 & this ) {
+    long long int c, i = 0, myTotal = 0;
+    for( ;;i++ ) {
+        waituntil( c << C ) { if ( c == -1 ) break; myTotal += c; }
+    }
+    __atomic_fetch_add( &globalTotal, myTotal, __ATOMIC_SEQ_CST );
+}
+
+size_t numtimes = 100000;
+size_t numServers = 1;
+int main( int argc, char * argv[] ) {
+    if ( argc == 2 )
+        numtimes = atoi( argv[1] );
+
+    processor p[numServers];
+    C{5};
+
+    long long int total = 0;
+    printf("start\n");
+    {
+        Server1 s[numServers];
+        for( long long int j = 0; j < numtimes; j++ ) {
+            waituntil( j >> C ) { total += j; }
+        }
+        printf("waiting for empty channels\n");
+        size_t C_count = get_count( C );
+        size_t LINE_COUNTER = 0;
+        while( C_count > 0 ) { 
+            C_count = get_count( C );
+        }
+        LINE_COUNTER = 7;
+        printf("sending sentinels\n");
+        LINE_COUNTER = 11;
+        for ( i; numServers ) insert( C, -1 );
+        LINE_COUNTER = 13;
+        printf("joining servers\n");
+        LINE_COUNTER = 17;
+    }
+    LINE_COUNTER = 19;
+    if ( total != globalTotal ) 
+        printf("CHECKSUM MISMATCH!! Main thread got %lld, server sum is %lld\n", total, globalTotal);
+    printf("done\n");
+}