Separate ExpressionVisitor from normal visitor