[C++11] Change some iterators to range-based for loops