Index: src/Tuples/AssignExpand.cc
===================================================================
--- src/Tuples/AssignExpand.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/Tuples/AssignExpand.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:16:39 2015
-// Update Count     : 4
+// Last Modified On : Mon May 18 11:24:47 2015
+// Update Count     : 2
 //
 
@@ -23,10 +23,8 @@
 #include "AssignExpand.h"
 
-#include "Parser/ParseNode.h"
-
 #include "SynTree/Type.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Expression.h"
 #include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
 
 namespace Tuples {
@@ -102,8 +100,8 @@
 					assert( rhsT->get_results().size() == 1 );
 					// declare temporaries
-					ObjectDecl *lhs = new ObjectDecl( temporaryNamer.newName("_lhs_"), DeclarationNode::NoStorageClass, LinkageSpec::Intrinsic, 0,
+					ObjectDecl *lhs = new ObjectDecl( temporaryNamer.newName("_lhs_"), Declaration::NoStorageClass, LinkageSpec::Intrinsic, 0,
 													  lhsT->get_results().front(), 0 );
 					decls.push_back( new DeclStmt( std::list< Label >(), lhs ) );
-					ObjectDecl *rhs = new ObjectDecl( temporaryNamer.newName("_rhs_"), DeclarationNode::NoStorageClass, LinkageSpec::Intrinsic, 0,
+					ObjectDecl *rhs = new ObjectDecl( temporaryNamer.newName("_rhs_"), Declaration::NoStorageClass, LinkageSpec::Intrinsic, 0,
 													  rhsT->get_results().front(), 0);
 					decls.push_back( new DeclStmt( std::list< Label >(), rhs ));
Index: src/Tuples/FunctionChecker.cc
===================================================================
--- src/Tuples/FunctionChecker.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/Tuples/FunctionChecker.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:17:19 2015
-// Update Count     : 4
+// Last Modified On : Mon May 18 11:59:55 2015
+// Update Count     : 3
 //
 
@@ -75,5 +75,5 @@
 		if ( applicationExpr->get_results().size() > 1 ) {
 			for ( std::list< Type *>::iterator res = applicationExpr->get_results().begin(); res != applicationExpr->get_results().end(); res++ )
-				temporaries.push_back( new ObjectDecl( nameGen->newName(), DeclarationNode::Auto, LinkageSpec::AutoGen, 0, (*res )->clone(), 0 ) );
+				temporaries.push_back( new ObjectDecl( nameGen->newName(),Declaration::Auto,LinkageSpec::AutoGen, 0, (*res )->clone(), 0 ) );
 
 			assert( ! temporaries.empty() );
Index: src/Tuples/MultRet.cc
===================================================================
--- src/Tuples/MultRet.cc	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/Tuples/MultRet.cc	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:54:44 2015
-// Update Count     : 2
+// Last Modified On : Mon May 18 12:37:57 2015
+// Update Count     : 1
 //
 
@@ -141,6 +141,7 @@
 	// Auxiliary function to generate new names for the `output' parameters
 	DeclStmt *MVRMutator::newVar( DeclarationWithType *reqDecl ) {
-		// std::ostringstream os;
+		// std::ostrstream os;
 		// os << "__" << curVal++ << "__";// << std::ends;
+		// os.freeze( false );
 
 		ObjectDecl *decl;
Index: src/Tuples/module.mk
===================================================================
--- src/Tuples/module.mk	(revision 721f17ac6221a75230b4b1228917e6a163b53ff6)
+++ src/Tuples/module.mk	(revision 09d789c493c816483fb88c49a900967b7addbd2c)
@@ -1,18 +1,2 @@
-######################### -*- Mode: Makefile-Gmake -*- ########################
-##
-## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-##
-## The contents of this file are covered under the licence agreement in the
-## file "LICENCE" distributed with Cforall.
-##
-## module.mk -- 
-##
-## Author           : Richard C. Bilson
-## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  1 17:54:33 2015
-## Update Count     : 1
-###############################################################################
-
 SRC += 	Tuples/Mutate.cc \
 	Tuples/AssignExpand.cc \
@@ -20,6 +4,5 @@
 	Tuples/TupleAssignment.cc \
 	Tuples/FunctionChecker.cc \
-	Tuples/NameMatcher.cc
-
+	Tuples/NameMatcher.cc \
 #	Tuples/MultipleAssign.cc \
 #	Tuples/FlattenTuple.cc \
@@ -27,3 +10,5 @@
 #	Tuples/FixReturn.cc \
 #	Tuples/MassAssignment.cc \
-#	Tuples/TupleFixer.cc
+#	Tuples/TupleFixer.cc \
+	$(NULL)
+