Merge "Next phase of the move, reformat use C++ features."