More work on unified iterators.