More small C++11 tweaks.