Index: src/Parser/ExpressionNode.cc
===================================================================
--- src/Parser/ExpressionNode.cc	(revision dbc733e74e21352b1f12b6a389e90ae1429a1fd2)
+++ src/Parser/ExpressionNode.cc	(revision f43df7359a563135ee2a3401a290c3f7ccdeccf5)
@@ -7,9 +7,9 @@
 // ExpressionNode.cc --
 //
-// Author           : Rodolfo G. Esteves
+// Author           : Peter A. Buhr
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep  1 21:49:16 2017
-// Update Count     : 622
+// Last Modified On : Fri Sep  1 22:57:24 2017
+// Update Count     : 625
 //
 
@@ -155,5 +155,5 @@
 } // build_constantInteger
 
-Expression * build_constantFloat( std::string & str ) {
+Expression * build_constantFloat( string & str ) {
 	static const BasicType::Kind kind[2][3] = {
 		{ BasicType::Float, BasicType::Double, BasicType::LongDouble },
@@ -205,5 +205,5 @@
 } // sepString
 
-Expression * build_constantChar( std::string & str ) {
+Expression * build_constantChar( string & str ) {
 	string units;										// units
 	sepString( str, units, '\'' );						// separate constant from units
@@ -218,5 +218,5 @@
 } // build_constantChar
 
-ConstantExpr * build_constantStr( std::string & str ) {
+ConstantExpr * build_constantStr( string & str ) {
 	string units;										// units
 	sepString( str, units, '"' );						// separate constant from units
@@ -235,9 +235,9 @@
 } // build_constantStr
 
-Expression * build_field_name_FLOATINGconstant( const std::string & str ) {
+Expression * build_field_name_FLOATINGconstant( const string & str ) {
 	// str is of the form A.B -> separate at the . and return member expression
 	int a, b;
 	char dot;
-	std::stringstream ss( str );
+	stringstream ss( str );
 	ss >> a >> dot >> b;
 	UntypedMemberExpr * ret = new UntypedMemberExpr( new ConstantExpr( Constant::from_int( b ) ), new ConstantExpr( Constant::from_int( a ) ) );
@@ -253,6 +253,6 @@
 		} else {
 			return new UntypedMemberExpr( fracts, fieldName );
-		}
-	}
+		} // if
+	} // if
 	return fieldName;
 } // make_field_name_fraction_constants
@@ -262,14 +262,14 @@
 } // build_field_name_fraction_constants
 
-Expression * build_field_name_REALFRACTIONconstant( const std::string & str ) {
+Expression * build_field_name_REALFRACTIONconstant( const string & str ) {
 	if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( "invalid tuple index " + str );
-	Expression * ret = build_constantInteger( *new std::string( str.substr(1) ) );
+	Expression * ret = build_constantInteger( *new string( str.substr(1) ) );
 	delete &str;
 	return ret;
 } // build_field_name_REALFRACTIONconstant
 
-Expression * build_field_name_REALDECIMALconstant( const std::string & str ) {
+Expression * build_field_name_REALDECIMALconstant( const string & str ) {
 	if ( str[str.size()-1] != '.' ) throw SemanticError( "invalid tuple index " + str );
-	Expression * ret = build_constantInteger( *new std::string( str.substr( 0, str.size()-1 ) ) );
+	Expression * ret = build_constantInteger( *new string( str.substr( 0, str.size()-1 ) ) );
 	delete &str;
 	return ret;
@@ -353,5 +353,5 @@
 
 Expression * build_unary_val( OperKinds op, ExpressionNode * expr_node ) {
-	std::list< Expression * > args;
+	list< Expression * > args;
 	args.push_back( maybeMoveBuild< Expression >(expr_node) );
 	return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
@@ -359,5 +359,5 @@
 
 Expression * build_unary_ptr( OperKinds op, ExpressionNode * expr_node ) {
-	std::list< Expression * > args;
+	list< Expression * > args;
 	args.push_back(  maybeMoveBuild< Expression >(expr_node) ); // xxx -- this is exactly the same as the val case now, refactor this code.
 	return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
@@ -365,5 +365,5 @@
 
 Expression * build_binary_val( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 ) {
-	std::list< Expression * > args;
+	list< Expression * > args;
 	args.push_back( maybeMoveBuild< Expression >(expr_node1) );
 	args.push_back( maybeMoveBuild< Expression >(expr_node2) );
@@ -372,5 +372,5 @@
 
 Expression * build_binary_ptr( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 ) {
-	std::list< Expression * > args;
+	list< Expression * > args;
 	args.push_back( maybeMoveBuild< Expression >(expr_node1) );
 	args.push_back( maybeMoveBuild< Expression >(expr_node2) );
@@ -395,5 +395,5 @@
 
 Expression * build_tuple( ExpressionNode * expr_node ) {
-	std::list< Expression * > exprs;
+	list< Expression * > exprs;
 	buildMoveList( expr_node, exprs );
 	return new UntypedTupleExpr( exprs );;
@@ -401,5 +401,5 @@
 
 Expression * build_func( ExpressionNode * function, ExpressionNode * expr_node ) {
-	std::list< Expression * > args;
+	list< Expression * > args;
 	buildMoveList( expr_node, args );
 	return new UntypedExpr( maybeMoveBuild< Expression >(function), args, nullptr );