Fix hanging watchers when rebasing scopes