Merge "Moar C++ refactoring."