More fixes to iterators

Fixes #8086 - 74aa7fa
Fixes #8085 - d29497b, instead of starting with the second item (which is the original code before fb87ae73c05522883ead35acd661554ea7f6c77d), start with the first and let the loop handle the first item.