Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 28a8cf9a6d4ac65b0d2dca677451b9f6e9533eec)
+++ src/SymTab/Validate.cc	(revision 8686f31372b7edb696278a0d0707626765889b2c)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Jul 03 13:17:07 2015
-// Update Count     : 131
+// Last Modified On : Tue Jul 07 10:41:23 2015
+// Update Count     : 136
 //
 
@@ -560,5 +560,5 @@
 		// E ?=?(E volatile *, E)
 		Type *etype = refType->clone();
-		etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
+		// etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
 
 		ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), etype ), 0 );
@@ -589,4 +589,10 @@
 
 		LibCfa::makeLibCfa( assigns );
+
+		// need to remove the prototypes, since these can appear nested in a routine
+		for (int start = 0, end = assigns.size()/2; start < end; start++) {
+			delete assigns.front();
+			assigns.pop_front();
+		}
 
 		declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 28a8cf9a6d4ac65b0d2dca677451b9f6e9533eec)
+++ src/main.cc	(revision 8686f31372b7edb696278a0d0707626765889b2c)
@@ -9,13 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-<<<<<<< Updated upstream
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 29 17:09:21 2015
-// Update Count     : 77
-=======
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Jul 03 13:08:52 2015
-// Update Count     : 75
->>>>>>> Stashed changes
+// Last Modified On : Mon Jul 06 15:01:26 2015
+// Update Count     : 79
 //