more C++11 cleanups