Concerning #566: More cleaning up NLPSolverInternal for readability.