Eliminated C++11 lambdas