C++11 cleanups