Index: tests/concurrency/channels/daisy_chain.cfa
===================================================================
--- tests/concurrency/channels/daisy_chain.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/channels/daisy_chain.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -23,5 +23,5 @@
         for ( ;; ) {
             token << *chain;
-            token >> *chain;
+            *chain << token;
             runs++;
         }
@@ -60,5 +60,5 @@
     Channel chainChan{ 1 };
 
-    ((int)0) >> chainChan;
+    chainChan << ((int)0);
 
     chain = &chainChan;    
Index: tests/concurrency/waituntil/all_types.cfa
===================================================================
--- tests/concurrency/waituntil/all_types.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/waituntil/all_types.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -96,7 +96,7 @@
             Churner c;
             for( long long int j = 0; j < numtimes; j++ ) {
-                when( j % 2 == 0 ) waituntil( j >> A ) { total += j; }
+                when( j % 2 == 0 ) waituntil( A << j ) { total += j; }
                 or when( j % 4 < 2 ) waituntil( B ) { produce_b_val( total ); }
-                and when( j % 8 < 4 ) waituntil( j >> C ) { total += j; }
+                and when( j % 8 < 4 ) waituntil( C << j ) { total += j; }
                 and waituntil( timeout( 1`ns ) ) {}
                 if ( j == numtimes / 2 )
Index: tests/concurrency/waituntil/channel_close.cfa
===================================================================
--- tests/concurrency/waituntil/channel_close.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/waituntil/channel_close.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -13,6 +13,6 @@
     try {
         for( long long int i = 0;;i++ ) {
-            waituntil( (i >> A) ) { inserts++; }
-            and waituntil( (i >> B) ) { inserts++; }
+            waituntil( A << i ) { inserts++; }
+            and waituntil( B << i ) { inserts++; }
         }
     } catch ( channel_closed * e ) {} 
Index: tests/concurrency/waituntil/channel_zero_size.cfa
===================================================================
--- tests/concurrency/waituntil/channel_zero_size.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/waituntil/channel_zero_size.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -37,7 +37,7 @@
         for( long long int j = 0; j < numtimes; j++ ) {
             // printf("loop\n");
-            waituntil( j >> A ) { total += j; }
-            or waituntil( j >> B ) { total += j; }
-            or waituntil( j >> C ) { total += j; }
+            waituntil( A << j ) { total += j; }
+            or waituntil( B << j ) { total += j; }
+            or waituntil( C << j ) { total += j; }
         }
         printf("sending sentinels\n");
Index: tests/concurrency/waituntil/channels.cfa
===================================================================
--- tests/concurrency/waituntil/channels.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/waituntil/channels.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -69,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( A << j ) { total += j; }
+                or when( j % 4 < 2 ) waituntil( B << j ) { total += j; }
+                and when( j % 8 < 4 ) waituntil( C << j ) { total += j; }
             }
             done = true;
Index: tests/concurrency/waituntil/one_chan.cfa
===================================================================
--- tests/concurrency/waituntil/one_chan.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/waituntil/one_chan.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -31,5 +31,5 @@
         Server1 s[numServers];
         for( long long int j = 0; j < numtimes; j++ ) {
-            waituntil( j >> C ) { total += j; }
+            waituntil( C << j ) { total += j; }
         }
         printf("waiting for empty channels\n");
Index: tests/concurrency/waituntil/repeat_close.cfa
===================================================================
--- tests/concurrency/waituntil/repeat_close.cfa	(revision d5926ae2d02730740e32060bf485feaac7e88402)
+++ tests/concurrency/waituntil/repeat_close.cfa	(revision ca22a7c7bf8925f9a2cc31e3ab27ecd4e46c0099)
@@ -15,10 +15,10 @@
     try {
         for( long long int i = 0;;i++ ) {
-            waituntil( (i >> A) ) { A_i++; }
-            and waituntil( (i >> B) ) { B_i++; }
-            and waituntil( (i >> C) ) { C_i++; }
-            and waituntil( (i >> D) ) { D_i++; }
-            and waituntil( (i >> E) ) { E_i++; }
-            and waituntil( (i >> F) ) { F_i++; }
+            waituntil( A << i ) { A_i++; }
+            and waituntil( B << i ) { B_i++; }
+            and waituntil( C << i ) { C_i++; }
+            and waituntil( D << i ) { D_i++; }
+            and waituntil( E << i ) { E_i++; }
+            and waituntil( F << i ) { F_i++; }
         }
     } catch ( channel_closed * e ) {} 
@@ -31,10 +31,10 @@
     try {
         for( ;; ) {
-            waituntil( remove(F) ) { F_removes++; }
-            or waituntil( remove(E) ) { E_removes++; }
-            or waituntil( remove(D) ) { D_removes++; }
-            or waituntil( remove(C) ) { C_removes++; }
-            or waituntil( remove(B) ) { B_removes++; }
-            or waituntil( remove(A) ) { A_removes++; }
+            waituntil( in << F ) { F_removes++; }
+            or waituntil( in << E ) { E_removes++; }
+            or waituntil( in << D ) { D_removes++; }
+            or waituntil( in << C ) { C_removes++; }
+            or waituntil( in << B ) { B_removes++; }
+            or waituntil( in << A ) { A_removes++; }
         }
     } catchResume ( channel_closed * e ) { } // continue to remove until would block