[RFC] Few two-iteration removals

3 instances of two-iteration anti-pattern code have been removed.
You can see the 3 individual commits.