Index: tests/genericUnion.cfa
===================================================================
--- tests/genericUnion.cfa	(revision f498c51a018fefd922490ffd5a590af5312c0cf3)
+++ tests/genericUnion.cfa	(revision d5b2ac82c5d162b3f54cf7db3bdcbb3a48149204)
@@ -1,2 +1,17 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// genericUnion.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Dec 25 14:42:46 2018
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec 25 14:46:33 2018
+// Update Count     : 2
+// 
+
 #include <limits.hfa>
 
@@ -4,10 +19,10 @@
 union ByteView {
 	T val;
-	char bytes[(sizeof(int))]; // want to change to sizeof(T)
+	char bytes[(sizeof(int))];							// want to change to sizeof(T)
 };
 
 forall(otype T)
 void print(ByteView(T) x) {
-	for (int i = 0; i < sizeof(int); i++) { // want to change to sizeof(T)
+	for (int i = 0; i < sizeof(int); i++) {				// want to change to sizeof(T)
 		printf("%02x", x.bytes[i] & 0xff);
 	}
@@ -29,2 +44,7 @@
 	f(i, -1);
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa genericUnion.cfa" //
+// End: //
Index: tests/withStatement.cfa
===================================================================
--- tests/withStatement.cfa	(revision f498c51a018fefd922490ffd5a590af5312c0cf3)
+++ tests/withStatement.cfa	(revision d5b2ac82c5d162b3f54cf7db3bdcbb3a48149204)
@@ -9,97 +9,98 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Dec 04 17:41:45 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Dec 04 17:45:07 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Dec 24 19:08:18 2018
+// Update Count     : 5
 //
 
+#include <fstream.hfa>
+
 struct S {
-  int i;
-  // dynamically allocated member ensures ctor/dtors are called correctly on temporaries
-  int * ptr;
+	int i;
+	// dynamically allocated member ensures ctor/dtors are called correctly on temporaries
+	int * ptr;
 };
 
 // with clause on reference parameter
-void ?{}(S & this, int n) with(this) {
-  i = n;
-  ptr = (int *)malloc(sizeof(int));
+void ?{}( S & this, int n ) with( this ) {
+	i = n;
+	ptr = (int *)malloc( sizeof(int) );
 }
 
-void ?{}(S & this) {
-  this{ 0 };
+void ?{}( S & this ) {
+	this{ 0 };
 }
 
-void ?{}(S & this, S other) {
-  this{ other.i };
+void ?{}( S & this, S other ) {
+	this{ other.i };
 }
 
-S ?=?(S & this, S other) with(this) {
-  i = other.i;
-  *ptr = *other.ptr;
-  return this;
+S ?=?( S & this, S other ) with( this ) {
+	i = other.i;
+	*ptr = *other.ptr;
+	return this;
 }
 
-void ^?{}(S & this) with(this) {
-  free(ptr);
+void ^?{}( S & this ) with( this ) {
+	free( ptr );
 }
 
 struct S2 {
-  S s;
+	S s;
 };
 
-void ?{}(S2 & this, int n) {
-  (this.s){ n };
+void ?{}( S2 & this, int n ) {
+	(this.s){ n };
 }
 
-forall(otype T)
+forall( otype T )
 struct Box {
-  T x;
+	T x;
 };
 
-forall(otype T)
-void ?{}(Box(T) & this) with(this) { // with clause in polymorphic function
-  x{};
+forall( otype T )
+void ?{}( Box(T) & this ) with( this ) { // with clause in polymorphic function
+	x{};
 }
 
-void print(int i) { printf("%d", i); }
+void print( int i ) { sout | i; }
 
-forall(otype T | { void print(T); })
-void foo(T t) {
-  Box(T) b = { t };
-  with(b) {  // with statement in polymorphic function
-    print(x);
-    printf("\n");
-  }
+forall( otype T | { void print( T ); })
+void foo( T t ) {
+	Box( T ) b = { t };
+	with( b ) {  // with statement in polymorphic function
+		print( x );
+	}
 }
 
 // ensure with-statement temporary generation works correctly
 S mk() {
-  printf("called mk\n");
-  return (S) { 444 };
+	sout | "called mk";
+	return (S){ 444 };
 }
 
 // ensure with-statement temporary generation with reference-returning functions works correctly
 S & ref() {
-  static S var = { 123456789 };
-  return var;
+	static S var = { 123456789 };
+	return var;
 }
 
 int main() {
-  S2 s2 = { 12345 };
-  with (s2) {
-    with(s) { // with s2.s
-      printf("%d %d %d\n", i, s.i, s2.s.i);
-      foo(i);  // s.i
-      with(mk()) {
-        printf("%d %d %d\n", i, i, i);
-        with(ref()) {
-          printf("%d %d %d\n", i, i, i);
-        } // with ref()
-        with(ref()) {
-          printf("%d %d %d\n", i, i, i);
-        } // with ref()
-      } // with mk()
-    } // with s
-  } // with s2
+	S2 s2 = { 12345 };
+	with ( s2) {
+		with( s ) { // with s2.s
+			sout | i | s.i | s2.s.i;
+			foo( i );  // s.i
+			with( mk()) {
+				sout | i | i | i;
+				with( ref()) {
+					sout | i | i | i;
+				} // with ref()
+				with( ref()) {
+					sout | i | i | i;
+				} // with ref()
+			} // with mk()
+		} // with s
+	} // with s2
 }