Refactored iterators.