Replaced loops with iterators.

Particularly those with removals.