Second pass with clang-modernize -loop-convert.