Replace more auto iterator variables