Updates to C++11 usage