Fix a second potential rpc_wakeup race...