Index: src/SynTree/ArrayType.cc
===================================================================
--- src/SynTree/ArrayType.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
+++ src/SynTree/ArrayType.cc	(revision bb8ea3011a8148746d8e28699f24b68eaa57a951)
@@ -5,10 +5,10 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ArrayType.cc -- 
+// ArrayType.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:19:07 2015
+// Last Modified On : Thu May 12 14:07:16 2016
 // Update Count     : 11
 //
@@ -51,5 +51,5 @@
 	if ( dimension ) {
 		os << " with dimension of ";
-		dimension->print( os, 0 );
+		dimension->print( os, indent );
 	} // if
 }
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
+++ src/SynTree/Expression.cc	(revision bb8ea3011a8148746d8e28699f24b68eaa57a951)
@@ -10,5 +10,5 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 04 12:14:09 2016
+// Last Modified On : Fri May 13 13:19:09 2016
 // Update Count     : 40
 //
@@ -75,5 +75,4 @@
 	constant.print( os );
 	Expression::print( os, indent );
-	os << std::endl;
 }
 
@@ -323,4 +322,5 @@
 	os << ", from aggregate: ";
 	if (agg != 0) {
+		os << std::string( indent + 2, ' ' );
 		agg->print(os, indent + 2);
 	}
@@ -358,4 +358,5 @@
 	os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
 	if (agg != 0) {
+		os << std::string( indent + 2, ' ' );
 		agg->print(os, indent + 2);
 	}
@@ -379,8 +380,8 @@
 void UntypedExpr::print( std::ostream &os, int indent ) const {
 	os << "Applying untyped: " << std::endl;
-	os << std::string( indent+4, ' ' );
-	function->print(os, indent + 4);
+	os << std::string( indent+2, ' ' );
+	function->print(os, indent + 2);
 	os << std::string( indent, ' ' ) << "...to: " << std::endl;
-	printAll(args, os, indent + 4);
+	printAll(args, os, indent + 2);
 	Expression::print( os, indent );
 }
Index: src/SynTree/Initializer.cc
===================================================================
--- src/SynTree/Initializer.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
+++ src/SynTree/Initializer.cc	(revision bb8ea3011a8148746d8e28699f24b68eaa57a951)
@@ -10,5 +10,5 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 12:50:47 2016
+// Last Modified On : Fri May 13 13:19:30 2016
 // Update Count     : 28
 //
@@ -48,6 +48,7 @@
 
 	if ( ! designators.empty() ) {
-		os << std::endl << std::string(indent + 2, ' ' ) << "designated by: "   << std::endl;
+		os << std::endl << std::string(indent + 2, ' ' ) << "designated by: " << std::endl;
 		for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ ) {
+			os << std::string(indent + 4, ' ' );
 			( *i )->print(os, indent + 4 );
 		}
Index: src/SynTree/ObjectDecl.cc
===================================================================
--- src/SynTree/ObjectDecl.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
+++ src/SynTree/ObjectDecl.cc	(revision bb8ea3011a8148746d8e28699f24b68eaa57a951)
@@ -10,5 +10,5 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 04 12:11:56 2016
+// Last Modified On : Fri May 13 13:20:17 2016
 // Update Count     : 30
 //
@@ -56,5 +56,4 @@
 
 	if ( init ) {
-		os << std::string(indent, ' ');
 		os << " with initializer ";
 		init->print( os, indent );
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
+++ src/SynTree/Statement.cc	(revision bb8ea3011a8148746d8e28699f24b68eaa57a951)
@@ -10,5 +10,5 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 13:34:32 2016
+// Last Modified On : Thu May 12 13:33:18 2016
 // Update Count     : 54
 //
@@ -43,5 +43,5 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) const {
-	os << "Expression Statement:" << endl << std::string( indent, ' ' );
+	os << "Expression Statement:" << endl << std::string( indent + 2, ' ' );
 	expr->print( os, indent + 2 );
 }
@@ -290,18 +290,25 @@
 	os << string( indent + 2, ' ' ) << "initialization: \n";
 	for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+		os << string( indent + 4, ' ' );
 		(*it)->print( os, indent + 4 );
 	}
 
 	os << "\n" << string( indent + 2, ' ' ) << "condition: \n";
-	if ( condition != 0 )
+	if ( condition != 0 ) {
+		os << string( indent + 4, ' ' );
 		condition->print( os, indent + 4 );
+	}
 
 	os << "\n" << string( indent + 2, ' ' ) << "increment: \n";
-	if ( increment != 0 )
+	if ( increment != 0 ) {
+		os << string( indent + 4, ' ' );
 		increment->print( os, indent + 4 );
+	}
 
 	os << "\n" << string( indent + 2, ' ' ) << "statement block: \n";
-	if ( body != 0 )
+	if ( body != 0 ) {
+		os << string( indent + 4, ' ' );
 		body->print( os, indent + 4 );
+	}
 
 	os << endl;