clean up metamodel stuff in ExpressionVisitor