Watcher: fix previous merge, code cleanup