Fix scope destruction to also destroy watchers.