clean up long iterator declarations using auto