Replace more auto iterators