Simplify watcher tracking