Concerning #663: Eliminated NonlinearSolve class