Update to use some C++11 features when possible.