Index: tests/concurrent/waitfor/barge.c
===================================================================
--- tests/concurrent/waitfor/barge.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/barge.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -48,5 +48,5 @@
 	yield(random( 10 ));
 	if( this.state != WAITFOR && !this.done && this.started ) {
-		serr | "Barging before caller detected" | endl;
+		serr | "Barging before caller detected";
 	}
 
@@ -66,9 +66,9 @@
 		this.state = WAITFOR;
 		waitfor(do_call, this) {
-			sout | i | endl;
+			sout | i;
 		}
 
 		if( this.state != CALL ) {
-			serr | "Barging after caller detected" | endl;
+			serr | "Barging after caller detected";
 		}
 	}
@@ -83,5 +83,5 @@
 
 int main() {
-	sout | "Starting" | endl;
+	sout | "Starting";
 	{
 		barger_t bargers[17];
@@ -89,4 +89,4 @@
 		waiter_t waiters;
 	}
-	sout | "Stopping" | endl;
+	sout | "Stopping";
 }
Index: tests/concurrent/waitfor/dtor.c
===================================================================
--- tests/concurrent/waitfor/dtor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/dtor.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -29,8 +29,8 @@
 	switch(state) {
 		case CTOR  : break;
-		case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR"  | endl; abort(); } this.state = state; break;
-		case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN"  | endl; abort(); } this.state = state; break;
-		case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER" | endl; abort(); } this.state = state; break;
-		case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"   | endl; abort(); } this.state = state; break;
+		case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR" ; abort(); } this.state = state; break;
+		case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN" ; abort(); } this.state = state; break;
+		case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER"; abort(); } this.state = state; break;
+		case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"  ; abort(); } this.state = state; break;
 	}
 }
@@ -54,5 +54,5 @@
 
 int main() {
-	sout | "Starting" | endl;
+	sout | "Starting";
 	processor p;
 	for( int i = 0; i < N; i++ ){
@@ -60,4 +60,4 @@
 		yield( random( 100 ) );
 	}
-	sout | "Stopping" | endl;
+	sout | "Stopping";
 }
Index: tests/concurrent/waitfor/else.c
===================================================================
--- tests/concurrent/waitfor/else.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/else.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -12,33 +12,33 @@
 void test( M & mutex m ) {
 	int i = 0;
-	sout | "Starting" | endl;
+	sout | "Starting";
 
 	when( false ) waitfor( notcalled, m );
 
-	sout | "Step" | i++ | endl;
+	sout | "Step" | i++;
 
 	waitfor( notcalled, m ); or else {
-		sout | "else called" | endl;
+		sout | "else called";
 	}
 
-	sout | "Step" | i++ | endl;
+	sout | "Step" | i++;
 
 	when( true ) waitfor( notcalled, m ); or when( true ) else {
-		sout | "else called" | endl;
+		sout | "else called";
 	}
 
-	sout | "Step" | i++ | endl;
+	sout | "Step" | i++;
 
 	when( false ) waitfor( notcalled, m ); or when( true ) else {
-		sout | "else called" | endl;
+		sout | "else called";
 	}
 
-	sout | "Step" | i++ | endl;
+	sout | "Step" | i++;
 
 	when( false ) waitfor( notcalled, m ); or when( false ) else {
-		sout | "else called" | endl;
+		sout | "else called";
 	}
 
-	sout | "Done" | endl;
+	sout | "Done";
 }
 
Index: tests/concurrent/waitfor/recurse.c
===================================================================
--- tests/concurrent/waitfor/recurse.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/recurse.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -95,5 +95,5 @@
 	rand_yield();
 
-	sout | "1st" | endl;
+	sout | "1st" | nl;
 
 	return this.counter < N ? (state_t)this.actions[idx] : (state_t)STOP;
@@ -123,5 +123,5 @@
 			case THIRD  : while( !global.ready ) { yield(); } this.state = call3( global, this.idx ); break;
 			case LAST   : while( !global.ready ) { yield(); } this.state = call4( global, this.idx ); break;
-			case STOP   : serr | "This should not happen" | endl;
+			case STOP   : serr | "This should not happen" | nl;
 		}
 	}
@@ -132,5 +132,6 @@
 int main() {
 	srandom( time(NULL) );
-	sout | "Starting" | endl;
+	sout | nlOff;					// turn off auto newline
+	sout | "Starting" | nl;
 	{
 		waiter_t waiters[4] = {
@@ -142,4 +143,4 @@
 		the_threads = waiters;
 	}
-	sout | "Stopping" | endl;
+	sout | "Stopping" | nl;
 }
Index: tests/concurrent/waitfor/simple.c
===================================================================
--- tests/concurrent/waitfor/simple.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/simple.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -31,8 +31,8 @@
 
 void do_wait( global_t * mutex a ) {
-	sout | "Waiting to accept" | endl;
+	sout | "Waiting to accept";
 	yield( random( 10 ) );
 
-	sout | "Accepting" | endl;
+	sout | "Accepting";
 
 	__acceptable_t acceptable;
@@ -43,5 +43,5 @@
 	__waitfor_internal( 1, &acceptable );
 
-	sout | "Accepted" | endl;
+	sout | "Accepted";
 	yield( random( 10 ) );
 }
@@ -50,5 +50,5 @@
 	for( int i = 0; i < N; i++ ) {
 		do_wait( &globalA );
-		sout | i | endl;
+		sout | i;
 	}
 
@@ -76,5 +76,5 @@
 	srandom( time( NULL ) );
 	printf("%p\n", &globalA);
-	sout | "Starting" | endl;
+	sout | "Starting";
 	{
 		Acceptor r;
@@ -82,4 +82,4 @@
 
 	}
-	sout | "Done" | endl;
+	sout | "Done";
 }
Index: tests/concurrent/waitfor/statment.c
===================================================================
--- tests/concurrent/waitfor/statment.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/statment.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -84,5 +84,5 @@
 		case 7: return call7( m );
 		default :
-			serr | "Incorrect index" | index | endl;
+			serr | "Incorrect index" | index;
 			abort();
 	}
@@ -102,11 +102,11 @@
 	while( !done ) {
 		   waitfor( get_index, this );
-		or waitfor( call1, this ) { sout | "Statement" | endl; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val | endl; } }
-		or waitfor( call2, this ) { sout | "Statement" | endl; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val | endl; } }
-		or waitfor( call3, this ) { sout | "Statement" | endl; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val | endl; } }
-		or waitfor( call4, this ) { sout | "Statement" | endl; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val | endl; } }
-		or waitfor( call5, this ) { sout | "Statement" | endl; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val | endl; } }
-		or waitfor( call6, this ) { sout | "Statement" | endl; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val | endl; } }
-		or waitfor( call7, this ) { sout | "Statement" | endl; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val | endl; } }
+		or waitfor( call1, this ) { sout | "Statement"; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val; } }
+		or waitfor( call2, this ) { sout | "Statement"; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val; } }
+		or waitfor( call3, this ) { sout | "Statement"; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val; } }
+		or waitfor( call4, this ) { sout | "Statement"; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val; } }
+		or waitfor( call5, this ) { sout | "Statement"; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val; } }
+		or waitfor( call6, this ) { sout | "Statement"; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val; } }
+		or waitfor( call7, this ) { sout | "Statement"; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val; } }
 
 		done = true;
@@ -128,9 +128,9 @@
 int main() {
 	processor p[2];
-	sout | "Starting" | endl;
+	sout | "Starting";
 	{
 		caller c[7];
 		waiter w;
 	}
-	sout | "Stopping" | endl;
+	sout | "Stopping";
 }
Index: tests/concurrent/waitfor/when.c
===================================================================
--- tests/concurrent/waitfor/when.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ tests/concurrent/waitfor/when.c	(revision 2a092d640cb7b13557e11e3a2f70f2d6e20115c8)
@@ -58,12 +58,12 @@
 void arbiter( global_t & mutex this ) {
 	for( int i = 0; i < N; i++ ) {
-		   when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call | endl; } }
-		or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call | endl; } }
-		or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call | endl; } }
-		or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call | endl; } }
-		or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call | endl; } }
-		or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call | endl; } }
+		   when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call; } }
+		or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call; } }
+		or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call; } }
+		or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call; } }
+		or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call; } }
+		or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call; } }
 
-		sout | this.last_call | endl;
+		sout | this.last_call;
 	}
 
@@ -78,5 +78,5 @@
 int main() {
 	srandom( time(NULL) );
-	sout | "Starting" | endl;
+	sout | "Starting";
 	{
 		arbiter_t arbiter;
@@ -84,4 +84,4 @@
 
 	}
-	sout | "Stopping" | endl;
+	sout | "Stopping";
 }