C++11 tweaks.