More std::function, cpplint.