Adapt to Iterators changes.