Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision 67d4e37911c715a1d255581a76351b6097f6d79f)
+++ src/Parser/ParseNode.h	(revision 1dda8deb7319f77e7c7b69e59e8d2b0cff67847d)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 13 15:44:20 2019
-// Update Count     : 873
+// Last Modified On : Mon Apr 15 14:22:39 2019
+// Update Count     : 874
 //
 
@@ -132,5 +132,4 @@
 	void printOneLine( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
 
-	Expression * get_expr() const { return expr.get(); }
 	template<typename T>
 	bool isExpressionType() const {	return nullptr != dynamic_cast<T>(expr.get()); }
Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 67d4e37911c715a1d255581a76351b6097f6d79f)
+++ src/Parser/parser.yy	(revision 1dda8deb7319f77e7c7b69e59e8d2b0cff67847d)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 13 14:00:24 2019
-// Update Count     : 4285
+// Last Modified On : Mon Apr 15 15:02:56 2019
+// Update Count     : 4290
 //
 
@@ -185,5 +185,5 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-	ConstantExpr * constant = dynamic_cast<ConstantExpr *>(type->get_expr());
+	ConstantExpr * constant = dynamic_cast<ConstantExpr *>(type->expr.get());
 	if ( constant && (constant->get_constant()->get_value() == "0" || constant->get_constant()->get_value() == "1") ) {
     	type = new ExpressionNode( new CastExpr( maybeMoveBuild< Expression >(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
@@ -198,7 +198,7 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, ExpressionNode * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-	if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->get_expr()) ) {
+	if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->expr.get()) ) {
 		return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
-	} else if ( CommaExpr * commaExpr = dynamic_cast<CommaExpr *>(index->get_expr()) ) {
+	} else if ( CommaExpr * commaExpr = dynamic_cast<CommaExpr *>(index->expr.get()) ) {
 		if ( NameExpr * identifier = dynamic_cast<NameExpr *>(commaExpr->arg1 ) ) {
 			return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );