ExpressionVisitor: temporary fix for #674: see issues for more details