NFC: Use range-based for loops and more consistent naming.