Cleaner RPC control flow: no more state machine