API-compatible changes to the C++ client

A very minor clean up of the C++ client code.