More C++11-ness.