More cleanups to move RPC layer towards being asynchronous.