Started simplifying the C++ RCP client.