Remove reference to WatchTree in watch.
Last bits of UI separation refactoring.