Two patches

One cleanup and one for using `bracket` in the `RpcClientMonad`.