Use success predicates in convergence steps

This should be done after #835.