C++ friendly modifications