Using range-based for where it makes sense. (#4537)