Index: src/Parser/ExpressionNode.cc
===================================================================
--- src/Parser/ExpressionNode.cc	(revision bc3127d4673a19c1f70b8cc4cc5902edde3e61d8)
+++ src/Parser/ExpressionNode.cc	(revision ba2a68bfe1c231085f20130d35762fa7b0b29a65)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep  1 15:07:09 2017
-// Update Count     : 618
+// Last Modified On : Fri Sep  1 21:49:16 2017
+// Update Count     : 622
 //
 
@@ -66,5 +66,5 @@
 } // sepNumeric
 
-Expression * build_constantInteger( std::string & str ) {
+Expression * build_constantInteger( string & str ) {
 	static const BasicType::Kind kind[2][3] = {
 		{ BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
@@ -148,5 +148,5 @@
   CLEANUP:
 	if ( units.length() != 0 ) {
-		ret = new UntypedExpr( new NameExpr( units, ret ) );
+		ret = new UntypedExpr( new NameExpr( units ), { ret } );
 	} // if
 
@@ -190,5 +190,5 @@
 	Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
 	if ( units.length() != 0 ) {
-		ret = new UntypedExpr( new NameExpr( units, ret ) );
+		ret = new UntypedExpr( new NameExpr( units ), { ret } );
 	} // if
 
@@ -211,5 +211,5 @@
 	Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
 	if ( units.length() != 0 ) {
-		ret = new UntypedExpr( new NameExpr( units, ret ) );
+		ret = new UntypedExpr( new NameExpr( units ), { ret } );
 	} // if
 
@@ -228,5 +228,5 @@
 // ROB: type mismatch
 	// if ( units.length() != 0 ) {
-	// 	ret = new UntypedExpr( new NameExpr( units, ret ) );
+	// 	ret = new UntypedExpr( new NameExpr( units ), { ret } );
 	// } // if