Deal with the case where we converge within the damping phase.

This had been a long-standing TODO within the code. Closes #866.