Start for changing to C++.
More changes to C++.