Interator performance enhancement and correctness.