Reduces code complexity a bit and ensures we don't  have to handle closed watch channels on our own
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>