Index: src/SynTree/BasicType.cc
===================================================================
--- src/SynTree/BasicType.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/BasicType.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 11:52:43 2015
-// Update Count     : 2
+// Last Modified On : Sun Jun  7 08:44:36 2015
+// Update Count     : 5
 //
 
Index: src/SynTree/Constant.cc
===================================================================
--- src/SynTree/Constant.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/Constant.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 12:17:22 2015
-// Update Count     : 2
+// Last Modified On : Sun Jun  7 08:45:30 2015
+// Update Count     : 5
 //
 
@@ -29,7 +29,6 @@
 	os << value;
 	if ( type ) {
-		os << " (type: ";
+		os << " ";
 		type->print( os );
-		os << ")";
 	} // if
 }
Index: src/SynTree/DeclStmt.cc
===================================================================
--- src/SynTree/DeclStmt.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/DeclStmt.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -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:16:03 2015
-// Update Count     : 2
+// Last Modified On : Mon Jun  8 17:24:38 2015
+// Update Count     : 3
 //
 
@@ -29,8 +29,7 @@
 
 void DeclStmt::print( std::ostream &os, int indent ) {
+	assert( decl != 0 );
 	os << "Declaration of ";
-	if ( decl ) {
-		decl->print( os, indent );
-	} // if
+	decl->print( os, indent );
 }
 
Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/Declaration.h	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -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 : Mon May 25 14:08:10 2015
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun  7 22:03:43 2015
+// Update Count     : 7
 //
 
@@ -38,5 +38,5 @@
 	virtual ~Declaration();
 
-	std::string get_name() const { return name; }
+	const std::string &get_name() const { return name; }
 	void set_name( std::string newValue ) { name = newValue; }
 	StorageClass get_storageClass() const { return storageClass; }
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/Expression.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 23:43:22 2015
-// Update Count     : 15
+// Last Modified On : Sun Jun  7 08:40:46 2015
+// Update Count     : 16
 //
 
@@ -72,5 +72,5 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-	os << "constant expression: " ;
+	os << "constant expression " ;
 	constant.print( os );
 	Expression::print( os, indent );
Index: src/SynTree/Expression.h
===================================================================
--- src/SynTree/Expression.h	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/Expression.h	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -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:46:15 2015
-// Update Count     : 3
+// Last Modified On : Sun Jun  7 22:03:44 2015
+// Update Count     : 4
 //
 
@@ -125,5 +125,5 @@
 	virtual ~NameExpr();
 
-	std::string get_name() const { return name; }
+	const std::string &get_name() const { return name; }
 	void set_name( std::string newValue ) { name = newValue; }
 
Index: src/SynTree/FunctionDecl.cc
===================================================================
--- src/SynTree/FunctionDecl.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/FunctionDecl.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 21 21:31:16 2015
-// Update Count     : 11
+// Last Modified On : Sun Jun  7 08:36:44 2015
+// Update Count     : 12
 //
 
@@ -52,5 +52,5 @@
 	
 	if ( get_name() != "" ) {
-		os << get_name() << ": a ";
+		os << get_name() << ": ";
 	} // if
 	if ( get_linkage() != LinkageSpec::Cforall ) {
@@ -91,5 +91,5 @@
 	
 	if ( get_name() != "" ) {
-		os << get_name() << ": a ";
+		os << get_name() << ": ";
 	} // if
 	if ( isInline ) {
Index: src/SynTree/NamedTypeDecl.cc
===================================================================
--- src/SynTree/NamedTypeDecl.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/NamedTypeDecl.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -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 10:13:19 2015
-// Update Count     : 1
+// Last Modified On : Sun Jun  7 08:36:09 2015
+// Update Count     : 2
 //
 
@@ -37,5 +37,5 @@
 	
 	if ( get_name() != "" ) {
-		os << get_name() << ": a ";
+		os << get_name() << ": ";
 	} // if
 	if ( get_storageClass() != NoStorageClass ) {
@@ -61,5 +61,5 @@
 	
 	if ( get_name() != "" ) {
-		os << get_name() << ": a ";
+		os << get_name() << ": ";
 	} // if
 	if ( get_storageClass() != NoStorageClass ) {
Index: src/SynTree/ReferenceToType.cc
===================================================================
--- src/SynTree/ReferenceToType.cc	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/ReferenceToType.cc	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:52:40 2015
-// Update Count     : 3
+// Last Modified On : Sun Jun  7 08:31:48 2015
+// Update Count     : 4
 //
 
@@ -101,5 +101,5 @@
 	
 	Type::print( os, indent );
-	os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " a function type) ";
+	os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) ";
 	if ( ! parameters.empty() ) {
 		os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
Index: src/SynTree/Type.h
===================================================================
--- src/SynTree/Type.h	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
+++ src/SynTree/Type.h	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 14:12:14 2015
-// Update Count     : 2
+// Last Modified On : Sun Jun  7 21:50:38 2015
+// Update Count     : 12
 //
 
@@ -214,5 +214,5 @@
 	virtual ~ReferenceToType();
 
-	std::string get_name() const { return name; }
+	const std::string &get_name() const { return name; }
 	void set_name( std::string newValue ) { name = newValue; }
 	std::list< Expression* >& get_parameters() { return parameters; }
@@ -372,5 +372,5 @@
 	virtual ~AttrType();
 
-	std::string get_name() const { return name; }
+	const std::string &get_name() const { return name; }
 	void set_name( const std::string &newValue ) { name = newValue; }
 	Expression *get_expr() const { return expr; }