Bug 729001: fix more build errors related to partial switch to C++.