Remove some C++11isms