ExpressionNode with parser internal refactor