Index: src/Tuples/TupleExpansion.cc
===================================================================
--- src/Tuples/TupleExpansion.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
+++ src/Tuples/TupleExpansion.cc	(revision d48e529cc868a651ee3760fbd3cf7b1570a205b4)
@@ -168,5 +168,5 @@
 				// steal the already generated assignment to var from the unqExpr - this has been generated by FixInit
 				Expression * expr = unqExpr->get_expr();
-				CommaExpr * commaExpr = safe_dynamic_cast< CommaExpr * >( expr );
+				CommaExpr * commaExpr = strict_dynamic_cast< CommaExpr * >( expr );
 				assignUnq = commaExpr->get_arg1();
 				commaExpr->set_arg1( nullptr );
@@ -237,9 +237,9 @@
 		delete tupleExpr;
 
-		StructInstType * type = safe_dynamic_cast< StructInstType * >( tuple->get_result() );
+		StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->get_result() );
 		StructDecl * structDecl = type->get_baseStruct();
 		assert( structDecl->get_members().size() > idx );
 		Declaration * member = *std::next(structDecl->get_members().begin(), idx);
-		MemberExpr * memExpr = new MemberExpr( safe_dynamic_cast< DeclarationWithType * >( member ), tuple );
+		MemberExpr * memExpr = new MemberExpr( strict_dynamic_cast< DeclarationWithType * >( member ), tuple );
 		memExpr->set_env( env );
 		return memExpr;