PLATFORM-392 Also tidy up the Python client