uio.Watcher refactors