Unify the two solvers in Solo. nsolve has now had recursion