Updated context/watcher.go.