Fix further fallout of the change to Iterator.