Bug #6430, the underlying cause of the looping, is fixed and marked for 
pullup to 1.10.  Leaving this issue open to track cleanups for the other 
three internal issues.