Merge in conversion to C++.