Index: src/Tuples/TupleExpansion.cc
===================================================================
--- src/Tuples/TupleExpansion.cc	(revision bbbc067e84adc59b31d39e97991980bf6379934a)
+++ src/Tuples/TupleExpansion.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -217,5 +217,5 @@
 		StructDecl * decl = typeMap[tupleSize];
 		StructInstType * newType = new StructInstType( qualifiers, decl );
-		for ( auto p : group_iterate( tupleType->get_types(), decl->get_parameters() ) ) {
+		for ( auto p : group_iterate( tupleType->types, decl->get_parameters() ) ) {
 			Type * t = std::get<0>(p);
 			newType->get_parameters().push_back( new TypeExpr( t->clone() ) );
@@ -298,5 +298,6 @@
 	Type * makeTupleType( const std::list< Expression * > & exprs ) {
 		// produce the TupleType which aggregates the types of the exprs
-		std::list< Type * > types;
+		std::vector< Type * > types;
+		types.reserve(exprs.size());
 		Type::Qualifiers qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Lvalue | Type::Atomic | Type::Mutex );
 		for ( Expression * expr : exprs ) {