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;
 }