This iterator change is pointless as best I can tell. (Same with the next one.) Please remove.