Index: src/SymTab/AddVisit.h
===================================================================
--- src/SymTab/AddVisit.h	(revision 85c4ef0989717f74ab61b2f8edadc71d37320cd6)
+++ src/SymTab/AddVisit.h	(revision 145f1fc837f3fe2237a52a1c4d10dfa54a209da5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 16:16:38 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:26:17 2015
+// Update Count     : 4
 //
 
@@ -57,5 +57,5 @@
 	inline void addVisit(ForStmt *forStmt, Visitor &visitor) {
 		addVisitStatement( forStmt->get_body(), visitor );
-		maybeAccept( forStmt->get_initialization(), visitor );
+		acceptAll( forStmt->get_initialization(), visitor );
 		maybeAccept( forStmt->get_condition(), visitor );
 		maybeAccept( forStmt->get_increment(), visitor );
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 85c4ef0989717f74ab61b2f8edadc71d37320cd6)
+++ src/SymTab/Validate.cc	(revision 145f1fc837f3fe2237a52a1c4d10dfa54a209da5)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jul 13 14:38:19 2015
-// Update Count     : 184
+// Last Modified On : Tue Jul 14 12:27:54 2015
+// Update Count     : 186
 //
 
@@ -530,5 +530,7 @@
 		init->get_args().push_back( new NameExpr( "0" ) );
 		Statement *initStmt = new ExprStmt( noLabels, init );
-  
+		std::list<Statement *> initList;
+		initList.push_back( initStmt );
+
 		UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
 		cond->get_args().push_back( new VariableExpr( index ) );
@@ -555,5 +557,5 @@
 		assignExpr->get_args().push_back( srcIndex );
   
-		*out++ = new ForStmt( noLabels, initStmt, cond, inc, new ExprStmt( noLabels, assignExpr ) );
+		*out++ = new ForStmt( noLabels, initList, cond, inc, new ExprStmt( noLabels, assignExpr ) );
 	}