Start fixing the fallout of the change to Iterator.