Fix build time output.
Add drop-in replacement for Watcher.