Updated commit makes etcd-watch a little cleaner