Bug 5705: Fix removing a subscriber from an Iterator