Index: src/Common/utility.h
===================================================================
--- src/Common/utility.h	(revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8)
+++ src/Common/utility.h	(revision 60089f42565ca08848d03f2778491035174aa588)
@@ -5,10 +5,10 @@
 // file "LICENCE" distributed with Cforall.
 //
-// utility.h -- 
+// utility.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  2 18:04:41 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Apr 28 13:18:24 2016
 // Update Count     : 16
 //
@@ -62,4 +62,5 @@
 			os << std::string( indent,  ' ' );
 			(*i)->print( os, indent + 2 );
+			// need an endl after each element because it's not easy to know when each individual item should end
 			os << std::endl;
 		} // if
@@ -128,5 +129,5 @@
 }
 
-template < typename T > 
+template < typename T >
 std::string toString ( T value ) {
 	std::ostringstream os;
Index: src/SynTree/CommaExpr.cc
===================================================================
--- src/SynTree/CommaExpr.cc	(revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8)
+++ src/SynTree/CommaExpr.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
@@ -5,10 +5,10 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CommaExpr.cc -- 
+// CommaExpr.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:09:58 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon May 02 15:11:29 2016
 // Update Count     : 1
 //
@@ -20,5 +20,11 @@
 CommaExpr::CommaExpr( Expression *arg1, Expression *arg2, Expression *_aname )
 		: Expression( _aname ), arg1( arg1 ), arg2( arg2 ) {
+	// xxx - result of a comma expression is never an lvalue, so should set lvalue
+	// to false on all result types. Actually doing this causes some strange things
+	// to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
 	cloneAll( arg2->get_results(), get_results() );
+	// for ( Type *& type : get_results() ) {
+	// 	type->set_isLvalue( false );
+	// }
 }
 
@@ -33,7 +39,9 @@
 
 void CommaExpr::print( std::ostream &os, int indent ) const {
-	os << std::string( indent, ' ' ) << "Comma Expression:" << std::endl;
+	os << "Comma Expression:" << std::endl;
+	os << std::string( indent+2, ' ' );
 	arg1->print( os, indent+2 );
 	os << std::endl;
+	os << std::string( indent+2, ' ' );
 	arg2->print( os, indent+2 );
 	Expression::print( os, indent );
Index: src/SynTree/CompoundStmt.cc
===================================================================
--- src/SynTree/CompoundStmt.cc	(revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8)
+++ src/SynTree/CompoundStmt.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
@@ -5,10 +5,10 @@
 // file "LICENCE" distributed with Cforall.
 //
-// XXX.cc -- 
+// XXX.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 11:37:49 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon May 02 15:10:47 2016
 // Update Count     : 3
 //
@@ -34,5 +34,5 @@
 
 void CompoundStmt::print( std::ostream &os, int indent ) const {
-	os << string( indent, ' ' ) << "CompoundStmt" << endl ;
+	os << "CompoundStmt" << endl ;
 	printAll( kids, os, indent + 2 );
 }
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8)
+++ src/SynTree/Expression.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
@@ -72,5 +72,5 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-	os << std::string( indent, ' ' ) << "constant expression " ;
+	os << "constant expression " ;
 	constant.print( os );
 	Expression::print( os, indent );
@@ -381,9 +381,8 @@
 void UntypedExpr::print( std::ostream &os, int indent ) const {
 	os << "Applying untyped: " << std::endl;
-	os << std::string( indent, ' ' );
+	os << std::string( indent+4, ' ' );
 	function->print(os, indent + 4);
 	os << std::string( indent, ' ' ) << "...to: " << std::endl;
-	os << std::string( indent, ' ' );
-	printArgs(os, indent + 4);
+	printAll(args, os, indent + 4);
 	Expression::print( os, indent );
 }
@@ -391,6 +390,8 @@
 void UntypedExpr::printArgs( std::ostream &os, int indent ) const {
 	std::list<Expression *>::const_iterator i;
-	for (i = args.begin(); i != args.end(); i++)
+	for (i = args.begin(); i != args.end(); i++) {
+		os << std::string(indent, ' ' );
 		(*i)->print(os, indent);
+	}
 }
 
Index: src/SynTree/Initializer.cc
===================================================================
--- src/SynTree/Initializer.cc	(revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8)
+++ src/SynTree/Initializer.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
@@ -44,4 +44,5 @@
 void SingleInit::print( std::ostream &os, int indent ) {
 	os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
+	os << std::string(indent+4, ' ' );
 	value->print( os, indent+4 );
 
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8)
+++ src/SynTree/Statement.cc	(revision 60089f42565ca08848d03f2778491035174aa588)
@@ -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:33:33 2016
+// Last Modified On : Thu Apr 28 13:34:32 2016
 // Update Count     : 54
 //
@@ -128,11 +128,15 @@
 void IfStmt::print( std::ostream &os, int indent ) const {
 	os << "If on condition: " << endl ;
+	os << string( indent+4, ' ' );
 	condition->print( os, indent + 4 );
 
-	os << string( indent, ' ' ) << ".... and branches: " << endl;
-
+	os << string( indent+2, ' ' ) << "... then: " << endl;
+
+	os << string( indent+4, ' ' );
 	thenPart->print( os, indent + 4 );
 
 	if ( elsePart != 0 ) {
+		os << string( indent+2, ' ' ) << "... else: " << endl;
+		os << string( indent+4, ' ' );
 		elsePart->print( os, indent + 4 );
 	} // if