Index: doc/papers/concurrency/Paper.tex
===================================================================
--- doc/papers/concurrency/Paper.tex	(revision 3b1825b3733425ee8a0becbd4c120f0a0f505f0c)
+++ doc/papers/concurrency/Paper.tex	(revision 0f78f3c74fc2f16353aa503a1bfa00a74e3db1f7)
@@ -686,5 +686,5 @@
 	Fib f1, f2;
 	for ( int i = 1; i <= 10; i += 1 ) {
-		sout | next( f1 ) | next( f2 ) | endl;
+		sout | next( f1 ) | next( f2 );
 	}
 }
@@ -772,10 +772,10 @@
 			sout | "  ";               // separator
 		}
-		sout | endl;
+		sout | nl;
 	}
 }
 void ?{}( Format & fmt ) { `resume( fmt );` }
 void ^?{}( Format & fmt ) with( fmt ) {
-	if ( g != 0 || b != 0 ) sout | endl;
+	if ( g != 0 || b != 0 ) sout | nl;
 }
 void format( Format & fmt ) {
@@ -855,11 +855,11 @@
 	for ( int i = 0; i < N; i += 1 ) {
 		int p1 = random( 100 ), p2 = random( 100 );
-		sout | p1 | " " | p2 | endl;
+		sout | p1 | " " | p2;
 		int status = delivery( c, p1, p2 );
-		sout | " $" | money | endl | status | endl;
+		sout | " $" | money | nl | status;
 		receipt += 1;
 	}
 	stop( c );
-	sout | "prod stops" | endl;
+	sout | "prod stops";
 }
 int payment( Prod & prod, int money ) {
@@ -895,11 +895,11 @@
 	int money = 1, receipt;
 	for ( ; ! done; ) {
-		sout | p1 | " " | p2 | endl | " $" | money | endl;
+		sout | p1 | " " | p2 | nl | " $" | money;
 		status += 1;
 		receipt = payment( p, money );
-		sout | " #" | receipt | endl;
+		sout | " #" | receipt;
 		money += 1;
 	}
-	sout | "cons stops" | endl;
+	sout | "cons stops";
 }
 int delivery( Cons & cons, int p1, int p2 ) {
@@ -1099,5 +1099,5 @@
 
 void main(foo & this) {
-	sout | "Hello World!" | endl;
+	sout | "Hello World!";
 }
 \end{cfa}
@@ -1124,5 +1124,5 @@
 
 void hello(/*unused*/ int) {
-	sout | "Hello World!" | endl;
+	sout | "Hello World!";
 }
 
@@ -1141,9 +1141,9 @@
 thread World {};
 void main( World & this ) {
-	sout | "World!" | endl;
+	sout | "World!";
 }
 int main() {
 	World w`[10]`;							$\C{// implicit forks after creation}$
-	sout | "Hello " | endl;					$\C{// "Hello " and 10 "World!" printed concurrently}$
+	sout | "Hello ";					$\C{// "Hello " and 10 "World!" printed concurrently}$
 }											$\C{// implicit joins before destruction}$
 \end{cfa}
@@ -1193,5 +1193,5 @@
 		total += subtotals[r];				$\C{// total subtotal}$
     }
-    sout | total | endl;
+    sout | total;
 }
 \end{cfa}
@@ -2192,5 +2192,5 @@
 	BENCH(
 		for ( size_t i = 0; i < N; i += 1 ) { @resume( c );@ } )
-	sout | result`ns | endl;
+	sout | result`ns;
 }
 \end{cfa}
@@ -2205,5 +2205,5 @@
 	BENCH(
 		for ( size_t i = 0; i < N; i += 1 ) { @yield();@ } )
-	sout | result`ns | endl;
+	sout | result`ns;
 }
 \end{cfa}
@@ -2244,5 +2244,5 @@
 int main() {
 	BENCH( for( size_t i = 0; i < N; i += 1 ) { @do_call( m1/*, m2, m3, m4*/ );@ } )
-	sout | result`ns | endl;
+	sout | result`ns;
 }
 \end{cfa}
@@ -2305,5 +2305,5 @@
 	BENCH( for ( size_t i = 0; i < N; i += 1 ) { @wait( c );@ } );
 	go = 0;	// stop other thread
-	sout | result`ns | endl;
+	sout | result`ns;
 }
 int main() {
@@ -2356,5 +2356,5 @@
 	BENCH( for ( size_t i = 0; i < N; i += 1 ) { @waitfor( do_call, m );@ } )
 	go = 0;	// stop other thread
-	sout | result`ns | endl;
+	sout | result`ns;
 }
 int main() {
@@ -2391,5 +2391,5 @@
 int main() {
 	BENCH( for ( size_t i = 0; i < N; i += 1 ) { @MyThread m;@ } )
-	sout | result`ns | endl;
+	sout | result`ns;
 }
 \end{cfa}