SolverVisitor improved