Step 2.2: Make well-formed C++ interfaces