Remove usage of C++11 features so that we compile cleanly on linux.