Index: tests/raii/dtor-early-exit.c
===================================================================
--- tests/raii/dtor-early-exit.c	(revision 5a5d31a2a5f79b60f24225ffc8c5d8d420ec352b)
+++ tests/raii/dtor-early-exit.c	(revision 200fcb3c496b08f843f691550554b21d786aad38)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 11 07:58:39 2018
-// Update Count     : 8
+// Last Modified On : Tue Dec 11 22:05:24 2018
+// Update Count     : 9
 //
 
@@ -25,14 +25,14 @@
 // don't want these called
 void ?{}(A & a) { assert( false ); }
-void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name | endl; a.x = (int*)malloc(); }
+void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name; a.x = (int*)malloc(); }
 void ?{}(A & a, const char * name, int * ptr) { assert( false ); }
 
 A ?=?(A & a, A b) {  sout | "assign " | a.name | " " | b.name; return a; }
-void ?{}(A & a, A b) { sout | "copy construct " | b.name | endl; a.x = (int*)malloc(); }
-void ^?{}(A & a) { sout | "destruct " | a.name | endl; free(a.x); }
+void ?{}(A & a, A b) { sout | "copy construct " | b.name; a.x = (int*)malloc(); }
+void ^?{}(A & a) { sout | "destruct " | a.name; free(a.x); }
 
 // test returns
 void f(int i) {
-	sout | "f i=" | i | endl;
+	sout | "f i=" | i;
 	A x = { "x" };  // construct x
 	{
@@ -55,14 +55,14 @@
 void g() {
 	for (int i = 0; i < 10; i++) {
-		sout | "g for i=" | i | endl;
+		sout | "g for i=" | i;
 		A x = { "x" };
 		// construct x
 		// destruct x
 	}
-	sout | endl;
+	sout | nl;
 	{
 		int i = 0;
 		while (i < 10) {
-			sout | "g while i=" | i | endl;
+			sout | "g while i=" | i;
 			A x = { "x" };
 			// construct x
@@ -71,5 +71,5 @@
 		}
 	}
-	sout | endl;
+	sout;
 	for (int i = 0; i < 10; i++) {
 		switch(10) {
@@ -78,10 +78,10 @@
 			case 10: {
 				A y = { "y" };
-				sout | "g switch i=" | i | endl;
+				sout | "g switch i=" | i;
 				// construct y
 				break; // destruct y
 			}
 			default: {
-				sout | "g switch i=" | i | endl;
+				sout | "g switch i=" | i;
 				A x = { "x" };
 				// construct x
@@ -90,33 +90,33 @@
 		}
 	}
-	sout | endl;
+	sout | nl;
 	for (int k = 0; k < 2; k++) {
-		sout | "g for k=" | k | endl;
+		sout | "g for k=" | k;
 		L1: for (int i = 0; i < 10; i++) {
-			sout | "g for i=" | i | endl;
+			sout | "g for i=" | i;
 
 			A x = { "x" };
 			if (i == 2) {
-				sout | "continue L1" | endl;
+				sout | "continue L1";
 				continue;  // destruct x
 			} else if (i == 3) {
-				sout | "break L1" | endl;
+				sout | "break L1";
 				break;  // destruct x
 			}
 
 			L2: for (int j = 0; j < 10; j++) {
-				sout | "g for j=" | j | endl;
+				sout | "g for j=" | j;
 				A y = { "y" };
 				if (j == 0) {
-					sout | "continue L2" | endl;
+					sout | "continue L2";
 					continue; // destruct y - missing because object that needs to be destructed is not a part of this block, it's a part of the for's block
 				} else if (j == 1) {
-					sout | "break L2" | endl;
+					sout | "break L2";
 					break;  // destruct y
 				} else if (i == 1) {
-					sout | "continue L1" | endl;
+					sout | "continue L1";
 					continue L1; // destruct x,y - note: continue takes you to destructors for block, so only generate destructor for y
 				} else if (k == 1) {
-					sout | "break L1" | endl;
+					sout | "break L1";
 					break L1;  // destruct x,y
 				}
@@ -125,10 +125,10 @@
 	}
 
-	sout | endl;
+	sout | nl;
 	L3: if( 3 ) {
 		A w = { "w" };
 		if( 4 ) {
 			A v = { "v" };
-			sout | "break L3" | endl;
+			sout | "break L3";
 			break L3;
 		}
@@ -144,5 +144,5 @@
 	// * if S_L-S_G is non-empty, error
 	// * emit destructors for all variables in S_G-S_L
-	sout | "h" | endl;
+	sout | "h";
 	{
 		L0: ;
@@ -152,11 +152,11 @@
 			A y = { "y" };
 			// S_L1 = { y }
-		L1: sout | "L1" | endl;
+		L1: sout | "L1";
 			A x = { "x" };
 			// S_L2 = { y, x }
-		L2: sout | "L2" | endl;
+		L2: sout | "L2";
 			if (i == 0) {
 				++i;
-				sout | "goto L1" | endl;
+				sout | "goto L1";
 				// S_G = { y, x }
 				goto L1;  // jump back, destruct b/c before x definition
@@ -165,5 +165,5 @@
 			} else if (i == 1) {
 				++i;
-				sout | "goto L2" | endl;
+				sout | "goto L2";
 				// S_G = { y, x }
 				goto L2;  // jump back, do not destruct
@@ -172,5 +172,5 @@
 			} else if (i == 2) {
 				++i;
-				sout | "goto L3" | endl;
+				sout | "goto L3";
 				// S_G = { y, x }
 				goto L3;  // jump ahead, do not destruct
@@ -180,5 +180,5 @@
 				++i;
 				A z = { "z" };
-				sout | "goto L3-2" | endl;
+				sout | "goto L3-2";
 				// S_G = { z, y, x }
 				goto L3;
@@ -187,5 +187,5 @@
 			} else {
 				++i;
-				sout | "goto L4" | endl;
+				sout | "goto L4";
 				// S_G = { y, x }
 				goto L4;  // jump ahead, destruct b/c left block x was defined in
@@ -194,6 +194,6 @@
 			}
 			// S_L3 = { y, x }
-		L3: sout | "L3" | endl;
-			sout | "goto L2-2" | endl;
+		L3: sout | "L3";
+			sout | "goto L2-2";
 			// S_G = { y, x }
 			goto L2; // jump back, do not destruct
@@ -202,7 +202,7 @@
 	}
 	// S_L4 = {}
-	L4: sout | "L4" | endl;
+	L4: sout | "L4";
 	if (i == 4) {
-		sout | "goto L0" | endl;
+		sout | "goto L0";
 		// S_G = {}
 		goto L0;
@@ -240,7 +240,7 @@
 		f(i);
 	}
-	sout | endl;
+	sout | nl;
 	g();
-	sout | endl;
+	sout | nl;
 	h();
 
Index: tests/raii/globals.c
===================================================================
--- tests/raii/globals.c	(revision 5a5d31a2a5f79b60f24225ffc8c5d8d420ec352b)
+++ tests/raii/globals.c	(revision 200fcb3c496b08f843f691550554b21d786aad38)
@@ -70,14 +70,14 @@
 
 int main() {
-	sout | "static\t\tinline\t\tautogen\t\tvalue" | endl;
+	sout | "static\t\tinline\t\tautogen\t\tvalue";
 
-	sout | "no \t\tno \t\tno \t\t" | g.val.value    | endl;
-	sout | "no \t\tno \t\tyes\t\t" | ga.val.value   | endl;
-	sout | "no \t\tyes\t\tno \t\t" | gi.val.value   | endl;
-	sout | "no \t\tyes\t\tyes\t\t" | gia.val.value  | endl;
-	sout | "yes\t\tno \t\tno \t\t" | gs.val.value   | endl;
-	sout | "yes\t\tno \t\tyes\t\t" | gsa.val.value  | endl;
-	sout | "yes\t\tyes\t\tno \t\t" | gsi.val.value  | endl;
-	sout | "yes\t\tyes\t\tyes\t\t" | gsia.val.value | endl;
+	sout | "no \t\tno \t\tno \t\t" | g.val.value;
+	sout | "no \t\tno \t\tyes\t\t" | ga.val.value;
+	sout | "no \t\tyes\t\tno \t\t" | gi.val.value;
+	sout | "no \t\tyes\t\tyes\t\t" | gia.val.value;
+	sout | "yes\t\tno \t\tno \t\t" | gs.val.value;
+	sout | "yes\t\tno \t\tyes\t\t" | gsa.val.value;
+	sout | "yes\t\tyes\t\tno \t\t" | gsi.val.value;
+	sout | "yes\t\tyes\t\tyes\t\t" | gsia.val.value;
 
 }