* Avoid skip_serializing_if since that breaks deserialization * Adapt RpcClient to recent token method changes