Merge the two convergence checks to one.