Modernization of C++ style.