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

Amend 82d177c
2 files changed