Adapt to RPC changes.