Consider the discussion on #728 and improve the iterators to avoid the traps.
Consider the discussion on #728 and improve the iterators to avoid the traps.