More conversion to C++