Cleanup new IterableBase code