Use default ref capture to simplify local lambdas, use a template to avoid std::function overhead, other cleanup

llvm-svn: 300461