Continued revamping the C++ codebase.