Get rid of lambdas/more auto iterators