424043 - IteratingCallback Idle race.

A few renamings and fixes to avoid IllegalStateExceptions.