Minor cleanups
Per-RPC retry support, used when subscribe() can't find an active instance.