Remove unshaded WatchableObject and change DataWatcher to not need it.