Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision 2bf7ef68b12c7963487e702a2d3dfe1a11b965f9)
+++ src/Concurrency/Keywords.cc	(revision 8d25360e4dfa05035c94eaafd0980fce401b0be7)
@@ -621,5 +621,5 @@
 			),
 			new ListInit(
-				map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
+				map_range < std::vector< Initializer * > > ( args, [](DeclarationWithType * var ){
 					Type * type = var->get_type()->clone();
 					type->set_mutex( false );
Index: src/Concurrency/Waitfor.cc
===================================================================
--- src/Concurrency/Waitfor.cc	(revision 2bf7ef68b12c7963487e702a2d3dfe1a11b965f9)
+++ src/Concurrency/Waitfor.cc	(revision 8d25360e4dfa05035c94eaafd0980fce401b0be7)
@@ -371,5 +371,5 @@
 			),
 			new ListInit(
-				map_range < std::list<Initializer*> > ( clause.target.arguments, [this](Expression * expr ){
+				map_range < std::vector< Initializer * > > ( clause.target.arguments, [this](Expression * expr ){
 					Expression * init = new CastExpr(
 						new UntypedExpr(