More C++11 related tweaks.