Index: tests/concurrency/waituntil/repeat_close.cfa
===================================================================
--- tests/concurrency/waituntil/repeat_close.cfa	(revision 21a700e1f73cba0d5a2ad54a3179965f8bdbc4be)
+++ tests/concurrency/waituntil/repeat_close.cfa	(revision d4c1d1f51797f1bdf08c6cfa4ebd67c513877cfc)
@@ -31,16 +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++; }
+            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++; }
         }
     } catchResume ( channel_closed * e ) { } // continue to remove until would block