More C++ ports.