Updated ExpressionParser grammar