Improve consistency between ExprVisitor and Expr types