Another minor improvement to watcher script