Resolve "Correct the use of iterators in for loops"

Closes #735 (closed).

I ran some tests and I have a 1-2% speedup, so not really significant, but I believe it is a good practice we should enforce.