448156 Fixed INACTIVE race in IteratingCallback

Additional cleanups of ICB code