Index: src/Parser/StatementNode.cc
===================================================================
--- src/Parser/StatementNode.cc	(revision 436bbe535206214ada05233b242baa9cb8b0bcad)
+++ src/Parser/StatementNode.cc	(revision becb85b97dc1a9442bf01215f96bdbbeaa1b9a9b)
@@ -5,11 +5,12 @@
 // file "LICENCE" distributed with Cforall.
 //
-// StatementNode.cc --
+// StatementNode.cc -- Transform from parse data-structures to AST data-structures, usually deleting the parse
+//     data-structure after the transformation.
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 09:45:28 2022
-// Update Count     : 415
+// Last Modified On : Wed Feb  2 12:27:58 2022
+// Update Count     : 424
 //
 
@@ -137,9 +138,9 @@
 
 Statement * build_case( ExpressionNode * ctl ) {
-	return new CaseStmt( maybeMoveBuild< Expression >(ctl), list< Statement * >{} );
+	return new CaseStmt( maybeMoveBuild< Expression >(ctl), {} ); // no init
 } // build_case
 
 Statement * build_default() {
-	return new CaseStmt( nullptr, list< Statement * >{}, true );
+	return new CaseStmt( nullptr, {}, true );			// no init
 } // build_default
 
@@ -159,7 +160,4 @@
 
 Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt, StatementNode * else_ ) {
-	// do-while cannot have declarations in the contitional, so always empty
-	list< Statement * > astinit;
-
 	list< Statement * > aststmt;						// loop body, compound created if empty
 	buildMoveList< Statement, StatementNode >( stmt, aststmt );
@@ -169,5 +167,6 @@
 	buildMoveList< Statement, StatementNode >( else_, astelse );
 
-	return new WhileDoStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), aststmt.front(), astelse.front(), astinit, true );
+	// do-while cannot have declarations in the contitional, so init is always empty
+	return new WhileDoStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), aststmt.front(), astelse.front(), {}, true );
 } // build_do_while