Change some auto iterators to be more compact