More C++ migration.