Lambdas are slightly more verbose, but also more readable. No functionality change intended. llvm-svn: 313482