More C++ conversions (in progress)