Small iterator consistency change ...

... shouldn't make any difference from a performance pov, though.
Merge pull request #59 from soc/topic/iterator-cleanup

Small iterator consistency change ...