Convergence test code is a little easier to read now.