Fixed a few more opportunities to use c++11.