Mostly cosmetic adjustments, but I added a more reliable method of
detecting whether an iteration is in progress.