We're all C++ now.
More C++ transition.