Index: src/ResolvExpr/Alternative.cc
===================================================================
--- src/ResolvExpr/Alternative.cc	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ src/ResolvExpr/Alternative.cc	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -78,5 +78,5 @@
 			os << "Null expression!" << std::endl;
 		} // if
-		os << indent << "Environment: ";
+		os << indent << "Environment:";
 		env.print( os, indent+1 );
 		os << std::endl;
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ src/SynTree/Expression.cc	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -376,5 +376,5 @@
 	os << "Untyped Member Expression, with field: " << std::endl << indent+1;
 	member->print(os, indent+1 );
-	os << indent << "... from aggregate: " << std::endl << indent+1;
+	os << indent << "... from aggregate:" << std::endl << indent+1;
 	aggregate->print(os, indent+1);
 	Expression::print( os, indent );
@@ -405,8 +405,8 @@
 
 void MemberExpr::print( std::ostream &os, Indenter indent ) const {
-	os << "Member Expression, with field: " << std::endl;
+	os << "Member Expression, with field:" << std::endl;
 	os << indent+1;
 	member->print( os, indent+1 );
-	os << std::endl << indent << "... from aggregate: " << std::endl << indent+1;
+	os << std::endl << indent << "... from aggregate:" << std::endl << indent+1;
 	aggregate->print(os, indent + 1);
 	Expression::print( os, indent );
Index: src/SynTree/FunctionDecl.cc
===================================================================
--- src/SynTree/FunctionDecl.cc	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ src/SynTree/FunctionDecl.cc	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -87,5 +87,5 @@
 
 	if ( statements ) {
-		os << indent << "... with body " << endl << indent+1;
+		os << indent << "... with body" << endl << indent+1;
 		statements->print( os, indent+1 );
 	} // if
Index: src/SynTree/FunctionType.cc
===================================================================
--- src/SynTree/FunctionType.cc	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ src/SynTree/FunctionType.cc	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -66,7 +66,7 @@
 		os << indent+1 << "accepting unspecified arguments" << endl;
 	} // if
-	os << indent << "... returning ";
+	os << indent << "... returning";
 	if ( returnVals.empty() ) {
-		os << "nothing " << endl;
+		os << " nothing" << endl;
 	} else {
 		os << endl;
Index: src/SynTree/ObjectDecl.cc
===================================================================
--- src/SynTree/ObjectDecl.cc	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ src/SynTree/ObjectDecl.cc	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -66,5 +66,5 @@
 
 	if ( ! attributes.empty() ) {
-		os << std::endl << indent << "... with attributes: " << std::endl;
+		os << std::endl << indent << "... with attributes:" << std::endl;
 		printAll( attributes, os, indent+1 );
 	}
Index: src/SynTree/ReferenceToType.cc
===================================================================
--- src/SynTree/ReferenceToType.cc	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ src/SynTree/ReferenceToType.cc	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -93,5 +93,5 @@
 	else {
 		Type::print( os, indent );
-		os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " ";
+		os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body();
 		if ( ! parameters.empty() ) {
 			os << endl << indent << "... with parameters" << endl;
@@ -136,5 +136,5 @@
 	else {
 		Type::print( os, indent );
-		os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " ";
+		os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body();
 		if ( ! parameters.empty() ) {
 			os << endl << indent << "... with parameters" << endl;
@@ -160,5 +160,5 @@
 	else {
 		Type::print( os, indent );
-		os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body() << " ";
+		os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body();
 	} // if
 }
Index: tests/.expect/castError.txt
===================================================================
--- tests/.expect/castError.txt	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ tests/.expect/castError.txt	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -7,5 +7,5 @@
      Variable Expression: f: function
        accepting unspecified arguments
-     ... returning nothing 
+     ... returning nothing
 
    ... to:
@@ -14,5 +14,5 @@
    char
  )
- Environment: 
+ Environment:
 
 Cost ( 1, 0, 0, 0 ): Cast of:
@@ -23,5 +23,5 @@
    char
  )
- Environment: 
+ Environment:
 
 Cost ( 1, 0, 0, 0 ): Cast of:
@@ -32,5 +32,5 @@
    char
  )
- Environment: 
+ Environment:
 
 
Index: tests/.expect/scopeErrors.txt
===================================================================
--- tests/.expect/scopeErrors.txt	(revision 25cdca5c4a8db986ee82c5ee8c23332ae17e445d)
+++ tests/.expect/scopeErrors.txt	(revision 08222c7e49659c436f018e164b994637bf7378e1)
@@ -3,10 +3,10 @@
 ... with parameters
   double
-... returning 
+... returning
   _retval_butThisIsAnError: double
-  ... with attributes: 
+  ... with attributes:
     Attribute with name: unused
 
-... with body 
+... with body
   CompoundStmt