connect watcher: dry improvements