Index: src/Tuples/TupleExpansion.cc
===================================================================
--- src/Tuples/TupleExpansion.cc	(revision af397ef8f0a43077863974fc725f7ae0d12ca892)
+++ src/Tuples/TupleExpansion.cc	(revision ba915fb57763ae661ddfbc000c81dde9a5ae0003)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:05:17 2017
-// Update Count     : 15
+// Last Modified On : Wed Jun 21 17:35:04 2017
+// Update Count     : 19
 //
 
@@ -191,10 +191,10 @@
 				commaExpr->set_arg1( nullptr );
 			}
-			BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
-			ObjectDecl * finished = new ObjectDecl( toString( "_unq", id, "_finished_" ), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::Bool ), new SingleInit( new ConstantExpr( Constant( boolType->clone(), "0" ) ), noDesignators ) );
+			ObjectDecl * finished = new ObjectDecl( toString( "_unq", id, "_finished_" ), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::Bool ),
+													new SingleInit( new ConstantExpr( Constant::from_int( 0 ) ), noDesignators ) );
 			addDeclaration( finished );
 			// (finished ? _unq_expr_N : (_unq_expr_N = <unqExpr->get_expr()>, finished = 1, _unq_expr_N))
 			// This pattern ensures that each unique expression is evaluated once, regardless of evaluation order of the generated C code.
-			Expression * assignFinished = UntypedExpr::createAssign( new VariableExpr(finished), new ConstantExpr( Constant( boolType->clone(), "1" ) ) );
+			Expression * assignFinished = UntypedExpr::createAssign( new VariableExpr(finished), new ConstantExpr( Constant::from_int( 1 ) ) );
 			ConditionalExpr * condExpr = new ConditionalExpr( new VariableExpr( finished ), var->clone(),
 				new CommaExpr( new CommaExpr( assignUnq, assignFinished ), var->clone() ) );