Remove further C++11 dependencies.