Added some C++ enhancements.