Index: tests/concurrent/waituntil/.expect/channels.txt
===================================================================
--- tests/concurrent/waituntil/.expect/channels.txt	(revision 386fb57527e7266fbdf2a63a63fa7f20796e2991)
+++ tests/concurrent/waituntil/.expect/channels.txt	(revision 386fb57527e7266fbdf2a63a63fa7f20796e2991)
@@ -0,0 +1,6 @@
+start
+terminating churner
+waiting for empty channels
+sending sentinels
+joining servers
+done
Index: tests/concurrent/waituntil/one_chan.cfa
===================================================================
--- tests/concurrent/waituntil/one_chan.cfa	(revision 7c2c37a402bcd40c4f45c35d23657b6386c07c69)
+++ tests/concurrent/waituntil/one_chan.cfa	(revision 386fb57527e7266fbdf2a63a63fa7f20796e2991)
@@ -28,5 +28,4 @@
     long long int total = 0;
     printf("start\n");
-    volatile size_t LINE_COUNTER = 1;
     {
         Server1 s[numServers];
@@ -34,22 +33,10 @@
             waituntil( j >> C ) { total += j; }
         }
-        LINE_COUNTER = 2;
         printf("waiting for empty channels\n");
-        LINE_COUNTER = 3;
-        // size_t C_count = get_count( C );
-        // LINE_COUNTER = 5;
-        // 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;
     }
     assert(get_count( C ) == 0);
-    LINE_COUNTER = 19;
     if ( total != globalTotal ) 
         printf("CHECKSUM MISMATCH!! Main thread got %lld, server sum is %lld\n", total, globalTotal);