Consistentcy in iteration blocks and remove unnecessary code

Just making some things consistent across files. Also removing some unnecessary code.
So is this the only line that's a cocern or do we want to leave all the for-in loops because those are hot code paths?