Optimizing AdaptSolver & related.