Remove some C++11isms.

Currently the nightly builds don't have C++11 enabled.