More preparations for C++ migration.