Index: src/Parser/ExpressionNode.cc
===================================================================
--- src/Parser/ExpressionNode.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/Parser/ExpressionNode.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 21:40:22 2015
-// Update Count     : 9
+// Last Modified On : Fri Jun  5 07:44:47 2015
+// Update Count     : 10
 // 
 
@@ -250,5 +250,5 @@
 void VarRefNode::print( std::ostream &os, int indent ) const {
 	printDesignation( os );
-	os << '\r' << string( indent, ' ') << "Referencing: ";
+	os << string( indent, ' ' ) << "Referencing: ";
 	os << "Variable: " << get_name();
 	os << endl;
@@ -273,5 +273,5 @@
 void OperatorNode::print( std::ostream &os, int indent ) const{
 	printDesignation( os );
-	os << '\r' << string( indent, ' ') << "Operator: " << OpName[type] << endl;
+	os << string( indent, ' ' ) << "Operator: " << OpName[type] << endl;
 	return;
 }
@@ -550,8 +550,8 @@
 void CompositeExprNode::print( std::ostream &os, int indent ) const {
 	printDesignation( os );
-	os << '\r' << string( indent, ' ') << "Application of: " << endl;
+	os << string( indent, ' ' ) << "Application of: " << endl;
 	function->print( os, indent + ParseNode::indent_by );
 
-	os << '\r' << string( indent, ' ') ;
+	os << string( indent, ' ' ) ;
 	if ( arguments ) {
 		os << "... on arguments: " << endl;
Index: src/Parser/StatementNode.cc
===================================================================
--- src/Parser/StatementNode.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/Parser/StatementNode.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  3 11:55:01 2015
-// Update Count     : 8
+// Last Modified On : Fri Jun  5 07:43:40 2015
+// Update Count     : 10
 //
 
@@ -49,13 +49,13 @@
 				next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) );
 				decl->set_next( 0 );
-			}
+			} // if
 		} else {
 			if ( decl->get_link() ) {
 				next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) );
 				decl->set_next( 0 );
-			}
+			} // if
 			this->decl = decl;
-		}
-	}
+		} // if
+	} // if
 }
 
@@ -98,5 +98,5 @@
 	} else {
 		newnode->target = 0;
-	}
+	} // if
 	newnode->decl = maybeClone( decl );
 	return newnode;
@@ -132,5 +132,5 @@
 		labels->push_front(*l ); 
 		delete l;
-	}
+	} // if
 	return this;
 }
@@ -151,5 +151,5 @@
 		else
 			block->set_link( stmt );
-	}
+	} // if
 	return this;
 }
@@ -165,18 +165,19 @@
 			else
 				block->set_link( stmt );
-	}
+	} // if
 	return this;
 }
 
 void StatementNode::print( std::ostream &os, int indent ) const {
-	if ( labels != 0 )
+	if ( labels != 0 ) {
 		if ( ! labels->empty()) {
 			std::list<std::string>::const_iterator i;
 
-			os << '\r' << string( indent, ' ');
+			os << string( indent, ' ' );
 			for ( i = labels->begin(); i != labels->end(); i++ )
 				os << *i << ":";
 			os << endl;
-		}
+		} // if
+	} // if
 
 	switch ( type ) {
@@ -193,28 +194,28 @@
 		break;
 	  default:
-		os << '\r' << string( indent, ' ') << StatementNode::StType[type] << endl;
+		os << string( indent, ' ' ) << StatementNode::StType[type] << endl;
 		if ( type == Catch ) {
 			if ( decl ) {
-				os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
+				os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
 				decl->print( os, indent + 2*ParseNode::indent_by );
 			} else if ( isCatchRest ) {
-				os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
+				os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
 			} else {
 				; // should never reach here
-			}
-		}
+			} // if
+		} // if
 		if ( control ) {
-			os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
+			os << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
 			control->printList( os, indent + 2*ParseNode::indent_by );
-		}
+		} // if
 		if ( block ) {
-			os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
+			os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
 			block->printList( os, indent + 2*ParseNode::indent_by );  
-		}
+		} // if
 		if ( target ) {
-			os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
-		}
+			os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
+		} // if
 		break;
-	}
+	} // switch
 }
 
@@ -227,5 +228,5 @@
 		std::back_insert_iterator< std::list<Label> > lab_it( labs );
 		copy( labels->begin(), labels->end(), lab_it );
-	}
+	} // if
 
 	// try {
@@ -254,5 +255,5 @@
 				elseb = branches.front();
 				branches.pop_front();
-			}
+			} // if
 			return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
 		}
@@ -299,5 +300,5 @@
 				assert( get_control() != 0 );
 				return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
-			}
+			} // if
 
 			return new BranchStmt( labs, get_target(), BranchStmt::Goto );
@@ -322,5 +323,5 @@
 			if ( ( finallyBlock = dynamic_cast<FinallyStmt *>( branches.back())) ) {
 				branches.pop_back();
-			}
+			} // if
 			return new TryStmt( labs, tryBlock, branches, finallyBlock );
 		}
@@ -342,5 +343,5 @@
 		// shouldn't be here
 		return 0;
-	}
+	} // switch
 }
 
@@ -356,5 +357,5 @@
 	} else {
 		last = 0;
-	}
+	} // if
 }
 
@@ -367,5 +368,5 @@
 		last->set_link( stmt );
 		last = ( StatementNode *)( stmt->get_link());
-	}
+	} // if
 }
 
@@ -373,5 +374,5 @@
 	if ( first ) {
 		first->printList( os, indent+2 );
-	}
+	} // if
 }
 
@@ -383,5 +384,5 @@
 		std::back_insert_iterator< std::list<Label> > lab_it( labs );
 		copy( labels->begin(), labels->end(), lab_it );
-	}
+	} // if
 
 	CompoundStmt *cs = new CompoundStmt( labs );
@@ -391,5 +392,5 @@
 
 void NullStmtNode::print( ostream &os, int indent ) const {
-	os << "\r" << string( indent, ' ') << "Null Statement:" << endl;
+	os << string( indent, ' ' ) << "Null Statement:" << endl;
 }
 
Index: src/SymTab/Indexer.cc
===================================================================
--- src/SymTab/Indexer.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SymTab/Indexer.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:49:55 2015
-// Update Count     : 3
+// Last Modified On : Fri Jun  5 08:05:17 2015
+// Update Count     : 5
 //
 
@@ -51,27 +51,29 @@
 	}
 
-/********
- * A NOTE ON THE ORDER OF TRAVERSAL
- *
- * Types and typedefs have their base types visited before they are added to the type table.
- * This is ok, since there is no such thing as a recursive type or typedef.
- *             typedef struct { T *x; } T; // never allowed
- *
- * for structs/unions, it is possible to have recursion, so the decl should be added as if it's
- * incomplete to begin, the members are traversed, and then the complete type should be added
- * (assuming the type is completed by this particular declaration).
- *             struct T { struct T *x; }; // allowed
- *
- * It's important to add the complete type to the symbol table *after* the members/base has been
- * traversed, since that traversal may modify the definition of the type and these modifications
- * should be visible when the symbol table is queried later in this pass.
- *
- * TODO: figure out whether recursive contexts are sensible/possible/reasonable.
- */
+
+// A NOTE ON THE ORDER OF TRAVERSAL
+//
+// Types and typedefs have their base types visited before they are added to the type table.  This is ok, since there is
+// no such thing as a recursive type or typedef.
+//
+//             typedef struct { T *x; } T; // never allowed
+//
+// for structs/unions, it is possible to have recursion, so the decl should be added as if it's incomplete to begin, the
+// members are traversed, and then the complete type should be added (assuming the type is completed by this particular
+// declaration).
+//
+//             struct T { struct T *x; }; // allowed
+//
+// It is important to add the complete type to the symbol table *after* the members/base has been traversed, since that
+// traversal may modify the definition of the type and these modifications should be visible when the symbol table is
+// queried later in this pass.
+//
+// TODO: figure out whether recursive contexts are sensible/possible/reasonable.
+
 
 	void Indexer::visit( TypeDecl *typeDecl ) {
 		// see A NOTE ON THE ORDER OF TRAVERSAL, above
-		// note that assertions come after the type is added to the symtab, since they aren't part
-		// of the type proper and may depend on the type itself
+		// note that assertions come after the type is added to the symtab, since they are not part of the type proper
+		// and may depend on the type itself
 		enterScope();
 		acceptAll( typeDecl->get_parameters(), *this );
Index: src/SynTree/CompoundStmt.cc
===================================================================
--- src/SynTree/CompoundStmt.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SynTree/CompoundStmt.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:11:02 2015
-// Update Count     : 1
+// Last Modified On : Fri Jun  5 07:46:03 2015
+// Update Count     : 2
 //
 
@@ -34,6 +34,6 @@
 
 void CompoundStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string(indent, ' ') << "CompoundStmt" << endl ;
-	printAll( kids, os, indent+2 );
+	os << string( indent, ' ' ) << "CompoundStmt" << endl ;
+	printAll( kids, os, indent + 2 );
 }
 
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SynTree/Expression.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 21:42:55 2015
-// Update Count     : 10
+// Last Modified On : Fri Jun  5 07:51:09 2015
+// Update Count     : 11
 //
 
@@ -93,5 +93,5 @@
 
 void VariableExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Variable Expression: ";
+	os << std::string( indent, ' ' ) << "Variable Expression: ";
 
 	Declaration *decl = get_var();
@@ -122,5 +122,5 @@
 
 void SizeofExpr::print( std::ostream &os, int indent) const {
-	os << std::string(indent, ' ') << "Sizeof Expression on: ";
+	os << std::string( indent, ' ' ) << "Sizeof Expression on: ";
 
 	if (isType)
@@ -152,5 +152,5 @@
 
 void AttrExpr::print( std::ostream &os, int indent) const {
-	os << std::string(indent, ' ') << "Attr ";
+	os << std::string( indent, ' ' ) << "Attr ";
 	attr->print( os, indent + 2 );
 	if ( isType || expr ) {
@@ -184,9 +184,9 @@
 
 void CastExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Cast of:" << std::endl;
+	os << std::string( indent, ' ' ) << "Cast of:" << std::endl;
 	arg->print(os, indent+2);
-	os << std::endl << std::string(indent, ' ') << "to:" << std::endl;
+	os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
 	if ( results.empty() ) {
-		os << std::string(indent+2, ' ') << "nothing" << std::endl;
+		os << std::string( indent+2, ' ' ) << "nothing" << std::endl;
 	} else {
 		printAll(results, os, indent+2);
@@ -207,8 +207,8 @@
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Member Expression, with field: " << get_member();
+	os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member();
 
 	Expression *agg = get_aggregate();
-	os << std::string(indent, ' ') << "from aggregate: ";
+	os << std::string( indent, ' ' ) << "from aggregate: ";
 	if (agg != 0) agg->print(os, indent + 2);
 	Expression::print( os, indent );
@@ -234,13 +234,13 @@
 
 void MemberExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Member Expression, with field: " << std::endl;
+	os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl;
 
 	assert( member );
-	os << std::string(indent + 2, ' ');
+	os << std::string( indent + 2, ' ' );
 	member->print( os, indent + 2 );
 	os << std::endl;
 
 	Expression *agg = get_aggregate();
-	os << std::string(indent, ' ') << "from aggregate: " << std::endl;
+	os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
 	if (agg != 0) agg->print(os, indent + 2);
 	Expression::print( os, indent );
@@ -261,7 +261,7 @@
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Applying untyped: " << std::endl;
+	os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl;
 	function->print(os, indent + 4);
-	os << "\r" << std::string(indent, ' ') << "...to: " << std::endl;
+	os << std::string( indent, ' ' ) << "...to: " << std::endl;
 	printArgs(os, indent + 4);
 	Expression::print( os, indent );
@@ -282,5 +282,5 @@
 
 void NameExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Name: " << get_name() << std::endl;
+	os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl;
 	Expression::print( os, indent );
 }
@@ -301,5 +301,5 @@
 
 void LogicalExpr::print( std::ostream &os, int indent )const {
-	os << std::string(indent, ' ') << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
+	os << std::string( indent, ' ' ) << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
 	arg1->print(os);
 	os << " and ";
@@ -323,9 +323,9 @@
 
 void ConditionalExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Conditional expression on: " << std::endl;
+	os << std::string( indent, ' ' ) << "Conditional expression on: " << std::endl;
 	arg1->print( os, indent+2 );
-	os << std::string(indent, ' ') << "First alternative:" << std::endl;
+	os << std::string( indent, ' ' ) << "First alternative:" << std::endl;
 	arg2->print( os, indent+2 );
-	os << std::string(indent, ' ') << "Second alternative:" << std::endl;
+	os << std::string( indent, ' ' ) << "Second alternative:" << std::endl;
 	arg3->print( os, indent+2 );
 	os << std::endl;
@@ -334,5 +334,5 @@
 
 void UntypedValofExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Valof Expression: " << std::endl;
+	os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
 	if ( get_body() != 0 )
 		get_body()->print( os, indent + 2 );
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SynTree/Statement.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 13:07:09 2015
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jun  5 07:51:04 2015
+// Update Count     : 15
 //
 
@@ -39,5 +39,5 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string(indent, ' ') << "Expression Statement:" << endl;
+	os << string( indent, ' ' ) << "Expression Statement:" << endl;
 	expr->print( os, indent + 2 );
 } 
@@ -59,5 +59,5 @@
 
 void BranchStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Branch (" << brType[type] << ")" << endl ;
+	os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
 }
 
@@ -69,5 +69,5 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << std::string( indent, ' ') << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+	os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
 	if ( expr != 0 ) expr->print( os );
 	os << endl;
@@ -80,8 +80,8 @@
 
 void IfStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "If on condition: " << endl ;
+	os << string( indent, ' ' ) << "If on condition: " << endl ;
 	condition->print( os, indent + 4 );
 
-	os << string( indent, ' ') << ".... and branches: " << endl;
+	os << string( indent, ' ' ) << ".... and branches: " << endl;
 
 	thenPart->print( os, indent + 4 );
@@ -104,5 +104,5 @@
 
 void SwitchStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Switch on condition: ";
+	os << string( indent, ' ' ) << "Switch on condition: ";
 	condition->print( os );
 	os << endl;
@@ -131,5 +131,5 @@
 
 void CaseStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ');
+	os << string( indent, ' ' );
 
 	if ( isDefault())
@@ -159,5 +159,5 @@
 
 void ChooseStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Choose on condition: ";
+	os << string( indent, ' ' ) << "Choose on condition: ";
 	condition->print( os );
 	os << endl;
@@ -172,5 +172,5 @@
 
 void FallthruStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Fall-through statement" << endl;
+	os << string( indent, ' ' ) << "Fall-through statement" << endl;
 }
 
@@ -184,8 +184,8 @@
 
 void WhileStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "While on condition: " << endl ;
+	os << string( indent, ' ' ) << "While on condition: " << endl ;
 	condition->print( os, indent + 4 );
 
-	os << string( indent, ' ') << ".... with body: " << endl;
+	os << string( indent, ' ' ) << ".... with body: " << endl;
 
 	if ( body != 0 ) body->print( os, indent + 4 );
@@ -204,5 +204,5 @@
 
 void ForStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Labels: {";
+	os << string( indent, ' ' ) << "Labels: {";
 	for (std::list<Label>::iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
 		os << *it << ",";
@@ -210,19 +210,19 @@
 	os << "}" << endl;
 
-	os << "\r" << string( indent, ' ') << "For Statement" << endl ;
-
-	os << "\r" << string( indent + 2, ' ') << "initialization: \n"; 
+	os << string( indent, ' ' ) << "For Statement" << endl ;
+
+	os << string( indent + 2, ' ' ) << "initialization: \n"; 
 	if ( initialization != 0 )
 		initialization->print( os, indent + 4 );
 
-	os << "\n\r" << string( indent + 2, ' ') << "condition: \n"; 
+	os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 
 	if ( condition != 0 )
 		condition->print( os, indent + 4 );
 
-	os << "\n\r" << string( indent + 2, ' ') << "increment: \n"; 
+	os << "\n" << string( indent + 2, ' ' ) << "increment: \n"; 
 	if ( increment != 0 )
 		increment->print( os, indent + 4 );
 
-	os << "\n\r" << string( indent + 2, ' ') << "statement block: \n"; 
+	os << "\n" << string( indent + 2, ' ' ) << "statement block: \n"; 
 	if ( body != 0 )
 		body->print( os, indent + 4 );
@@ -246,10 +246,10 @@
 
 void TryStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Try Statement" << endl;
-	os << string( indent + 2, ' ') << "with block: " << endl;
+	os << string( indent, ' ' ) << "Try Statement" << endl;
+	os << string( indent + 2, ' ' ) << "with block: " << endl;
 	block->print( os, indent + 4 );
 
 	// handlers
-	os << string( indent + 2, ' ') << "and handlers: " << endl;
+	os << string( indent + 2, ' ' ) << "and handlers: " << endl;
 	std::list<Statement *>::iterator i;
 	for ( i = handlers.begin(); i != handlers.end(); i++)
@@ -258,5 +258,5 @@
 	// finally block
 	if ( finallyBlock != 0 ) {
-		os << string( indent + 2, ' ') << "Finally block: " << endl;
+		os << string( indent + 2, ' ' ) << "Finally block: " << endl;
 		finallyBlock->print( os, indent + 4 );
 	} // if
@@ -273,14 +273,14 @@
 
 void CatchStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Catch Statement" << endl;
-
-	os << "\r" << string( indent, ' ') << "... catching" << endl;
+	os << string( indent, ' ' ) << "Catch Statement" << endl;
+
+	os << string( indent, ' ' ) << "... catching" << endl;
 	if ( decl ) {
 		decl->printShort( os, indent + 4 );
 		os << endl;
 	} else if ( catchRest )
-		os << "\r" << string( indent + 4 , ' ') << "the rest" << endl;
+		os << string( indent + 4 , ' ' ) << "the rest" << endl;
 	else
-		os << "\r" << string( indent + 4 , ' ') << ">>> Error:  this catch clause must have a declaration <<<" << endl;
+		os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
 }
 
@@ -295,6 +295,6 @@
 
 void FinallyStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Finally Statement" << endl;
-	os << string( indent + 2, ' ') << "with block: " << endl;
+	os << string( indent, ' ' ) << "Finally Statement" << endl;
+	os << string( indent + 2, ' ' ) << "with block: " << endl;
 	block->print( os, indent + 4 );
 }
@@ -305,5 +305,5 @@
 
 void NullStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Null Statement" << endl ;
+	os << string( indent, ' ' ) << "Null Statement" << endl ;
 }
 
Index: src/Tests/SynTree/make-rules
===================================================================
--- src/Tests/SynTree/make-rules	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/Tests/SynTree/make-rules	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -8,8 +8,8 @@
 TEST_IN := $(TESTS:.tst=.c)
 
-$(OUTPUTDIR)/%.tst:%.c $(CFA)
+$(OUTPUTDIR)/%.tst : %.c $(CFA)
 	$(CFA) $(CFAOPT) < $< > $@ 2>&1
 
-$(OUTPUTDIR)/report: $(TESTS) $(EXPECTED)
+$(OUTPUTDIR)/report : $(TESTS) $(EXPECTED)
 	rm -f $@
 	@for i in $(TESTS); do \
@@ -18,4 +18,4 @@
 	done
 
-clean:
+clean :
 	rm -rf $(OUTPUTDIR)
Index: src/examples/Makefile.am
===================================================================
--- src/examples/Makefile.am	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/examples/Makefile.am	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -11,10 +11,7 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun May 31 14:16:58 2015
-## Update Count     : 21
+## Last Modified On : Thu Jun  4 23:13:10 2015
+## Update Count     : 22
 ###############################################################################
-
-# create object files in directory with source files
-#AUTOMAKE_OPTIONS = subdir-objects
 
 # applies to both programs
Index: src/examples/Makefile.in
===================================================================
--- src/examples/Makefile.in	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/examples/Makefile.in	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
@@ -18,7 +18,4 @@
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ###############################################################################
-
-# create object files in directory with source files
-#AUTOMAKE_OPTIONS = subdir-objects
 
 VPATH = @srcdir@