- C++11-ify