Solve clang warnings, per ATLASRECTS-5229. Along the way, changed two loops to range based for-loops.