Index: src/SymTab/AddVisit.h
===================================================================
--- src/SymTab/AddVisit.h	(revision 0b4d93ab69edf7fa57003bb50480e01377bd9ac4)
+++ src/SymTab/AddVisit.h	(revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:52:42 2016
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:46:33 2016
+// Update Count     : 6
 //
 
@@ -38,16 +38,4 @@
 
 	template< typename Visitor >
-	inline void addVisit(ChooseStmt *switchStmt, Visitor &visitor) {
-		addVisitStatementList( switchStmt->get_branches(), visitor );
-		maybeAccept( switchStmt->get_condition(), visitor );
-	}
-
-	// template< typename Visitor >
-	// inline void addVisit(CaseStmt *caseStmt, Visitor &visitor) {
-	// 	addVisitStatementList( caseStmt->get_statements(), visitor );
-	// 	maybeAccept( caseStmt->get_condition(), visitor );
-	// }
-
-	template< typename Visitor >
 	void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor, bool addBefore ) {
 		std::list< Declaration * >::iterator i = translationUnit.begin();
Index: src/SymTab/Autogen.cc
===================================================================
--- src/SymTab/Autogen.cc	(revision 0b4d93ab69edf7fa57003bb50480e01377bd9ac4)
+++ src/SymTab/Autogen.cc	(revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19)
@@ -9,7 +9,7 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 26 14:14:09 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:47:17 2016
+// Update Count     : 2
 //
 
@@ -42,6 +42,4 @@
 		virtual void visit( CompoundStmt *compoundStmt );
 		virtual void visit( SwitchStmt *switchStmt );
-		virtual void visit( ChooseStmt *chooseStmt );
-		// virtual void visit( CaseStmt *caseStmt );
 
 		AutogenerateRoutines() : functionNesting( 0 ) {}
@@ -551,11 +549,3 @@
 		visitStatement( switchStmt );
 	}
-
-	void AutogenerateRoutines::visit( ChooseStmt *switchStmt ) {
-		visitStatement( switchStmt );
-	}
-
-	// void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
-	// 	visitStatement( caseStmt );
-	// }
 } // SymTab
Index: src/SymTab/Indexer.cc
===================================================================
--- src/SymTab/Indexer.cc	(revision 0b4d93ab69edf7fa57003bb50480e01377bd9ac4)
+++ src/SymTab/Indexer.cc	(revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 22 15:25:43 2016
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:47:47 2016
+// Update Count     : 12
 //
 
@@ -520,6 +520,5 @@
 			const MangleTable &mangleTable = decls->second;
 			for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
-				// check for C decls with the same name, skipping
-				// those with a compatible type (by mangleName)
+				// check for C decls with the same name, skipping those with a compatible type (by mangleName)
 				if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
 			}
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 0b4d93ab69edf7fa57003bb50480e01377bd9ac4)
+++ src/SymTab/Validate.cc	(revision 4e06c1ebfdf762654ec91b9a78bae607f25fba19)
@@ -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 : Wed May 11 13:17:52 2016
-// Update Count     : 297
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:49:21 2016
+// Update Count     : 298
 //
 
@@ -74,6 +74,4 @@
 		virtual void visit( CompoundStmt *compoundStmt );
 		virtual void visit( SwitchStmt *switchStmt );
-		virtual void visit( ChooseStmt *chooseStmt );
-		// virtual void visit( CaseStmt *caseStmt );
 	  private:
 		HoistStruct();
@@ -268,12 +266,4 @@
 		addVisit( switchStmt, *this );
 	}
-
-	void HoistStruct::visit( ChooseStmt *switchStmt ) {
-		addVisit( switchStmt, *this );
-	}
-
-	// void HoistStruct::visit( CaseStmt *caseStmt ) {
-	// 	addVisit( caseStmt, *this );
-	// }
 
 	void Pass1::visit( EnumDecl *enumDecl ) {
@@ -551,4 +541,5 @@
 		if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
 			return new StructDecl( aggDecl->get_name() );
+//			return aggDecl->get_baseStruct();
 		} else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
 			return new UnionDecl( aggDecl->get_name() );
@@ -645,4 +636,5 @@
 		} // if
 	}
+
 	Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
 		addImplicitTypedef( structDecl );
@@ -691,12 +683,4 @@
 
 		Visitor::visit( funcDecl );
-		// original idea: modify signature of ctor/dtors and insert appropriate return statements
-		// to cause desired behaviour
-		// new idea: add comma exprs to every ctor call to produce first parameter.
-		// this requires some memoization of the first parameter, because it can be a
-		// complicated expression with side effects (see: malloc). idea: add temporary variable
-		// that is assigned address of constructed object in ctor argument position and
-		// return the temporary. It should also be done after all implicit ctors are
-		// added, so not in this pass!
 	}