C++11 cleanup.