Enhancements for ExpressionParser