More consistency in loops.
Merge pull request #3025 from braddunbar/loops

More consistency in loops.