Ditch useless C++ compatibility goo