Simplify iterator management. NFC.