Continuing rework for async RPC.