Use C++11 where we can