Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/SymTab/Mangler.cc	(revision cda48b6ebb3fe47a472e098d755ee821ad1681f7)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:50:47 2015
-// Update Count     : 3
+// Last Modified On : Mon Jun  8 15:12:12 2015
+// Update Count     : 8
 //
 
@@ -160,7 +160,6 @@
 		} else {
 			printQualifiers( typeInst );
-			std::ostrstream numStream;
+			std::ostringstream numStream;
 			numStream << varNum->second.first;
-			mangleName << (numStream.pcount() + 1);
 			switch ( (TypeDecl::Kind )varNum->second.second ) {
 			  case TypeDecl::Any:
@@ -174,5 +173,5 @@
 				break;
 			} // switch
-			mangleName << std::string( numStream.str(), numStream.pcount() );
+			mangleName << numStream.str();
 		} // if
 	}
@@ -220,5 +219,5 @@
 					sub_mangler.varNums = varNums;
 					(*assert)->accept( sub_mangler );
-					assertionNames.push_back( std::string( sub_mangler.mangleName.str(), sub_mangler.mangleName.pcount() ) );
+					assertionNames.push_back( sub_mangler.mangleName.str() );
 				} // for
 			} // for
Index: src/SymTab/Mangler.h
===================================================================
--- src/SymTab/Mangler.h	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/SymTab/Mangler.h	(revision cda48b6ebb3fe47a472e098d755ee821ad1681f7)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:44:03 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:49:21 2015
-// Update Count     : 3
+// Last Modified On : Mon Jun  8 14:47:14 2015
+// Update Count     : 5
 //
 
@@ -17,5 +17,5 @@
 #define MANGLER_H
 
-#include <strstream>
+#include <sstream>
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
@@ -43,7 +43,7 @@
 		virtual void visit( TupleType *tupleType );
   
-		std::string get_mangleName() { return std::string( mangleName.str(), mangleName.pcount() ); }
+		std::string get_mangleName() { return mangleName.str(); }
 	  private:
-		std::ostrstream mangleName;
+		std::ostringstream mangleName;
 		typedef std::map< std::string, std::pair< int, int > > VarMapType;
 		VarMapType varNums;
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/SymTab/Validate.cc	(revision cda48b6ebb3fe47a472e098d755ee821ad1681f7)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 25 14:27:15 2015
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun  8 17:19:35 2015
+// Update Count     : 22
 //
 
@@ -651,10 +651,8 @@
 
 	void addDecls( std::list< Declaration * > &declsToAdd, std::list< Statement * > &statements, std::list< Statement * >::iterator i ) {
-		if ( ! declsToAdd.empty() ) {
-			for ( std::list< Declaration * >::iterator decl = declsToAdd.begin(); decl != declsToAdd.end(); ++decl ) {
-				statements.insert( i, new DeclStmt( noLabels, *decl ) );
-			} // for
-			declsToAdd.clear();
-		} // if
+		for ( std::list< Declaration * >::iterator decl = declsToAdd.begin(); decl != declsToAdd.end(); ++decl ) {
+			statements.insert( i, new DeclStmt( noLabels, *decl ) );
+		} // for
+		declsToAdd.clear();
 	}