Good points. I'll make the change to skip `visit` for unwatch.