Convert more interface code to c++.