Fix panic on watcher shutdown and simplify Close