[cleanup] Switch to using range-based for loops in two very obvious
places.