More robust ZK watcher handling.