Still getting rid of watcher references.