Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
+++ src/SynTree/Expression.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
@@ -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:52:40 2016
+// Last Modified On : Wed May 04 12:14:09 2016
 // Update Count     : 40
 //
@@ -321,7 +321,6 @@
 
 	Expression *agg = get_aggregate();
-	os << std::string( indent, ' ' ) << "from aggregate: ";
+	os << ", from aggregate: ";
 	if (agg != 0) {
-		os << std::string( indent+2, ' ' );
 		agg->print(os, indent + 2);
 	}
@@ -359,5 +358,4 @@
 	os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
 	if (agg != 0) {
-		os << std::string( indent+2, ' ' );
 		agg->print(os, indent + 2);
 	}
Index: src/SynTree/FunctionDecl.cc
===================================================================
--- src/SynTree/FunctionDecl.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
+++ src/SynTree/FunctionDecl.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
@@ -5,10 +5,10 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FunctionDecl.cc -- 
+// FunctionDecl.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:11:44 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue May 03 15:37:43 2016
 // Update Count     : 19
 //
@@ -52,5 +52,5 @@
 	using std::endl;
 	using std::string;
-	
+
 	if ( get_name() != "" ) {
 		os << get_name() << ": ";
@@ -87,4 +87,5 @@
 	if ( statements ) {
 		os << string( indent + 2, ' ' ) << "with body " << endl;
+		os << string( indent + 4, ' ' );
 		statements->print( os, indent + 4 );
 	} // if
@@ -94,5 +95,5 @@
 	using std::endl;
 	using std::string;
-	
+
 	if ( get_name() != "" ) {
 		os << get_name() << ": ";
Index: src/SynTree/ObjectDecl.cc
===================================================================
--- src/SynTree/ObjectDecl.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
+++ src/SynTree/ObjectDecl.cc	(revision 9243a50199e3b682c9f127c7ef2e5026dfed5c2f)
@@ -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:53:13 2016
+// Last Modified On : Wed May 04 12:11:56 2016
 // Update Count     : 30
 //
@@ -56,4 +56,5 @@
 
 	if ( init ) {
+		os << std::string(indent, ' ');
 		os << " with initializer ";
 		init->print( os, indent );
@@ -61,4 +62,5 @@
 
 	if ( bitfieldWidth ) {
+		os << std::string(indent, ' ');
 		os << " with bitfield width ";
 		bitfieldWidth->print( os );