Expressionvisitor: imports cleanup