Last refactoring of nonlinear solvers.