Convert more files into std::bind().