Shave a line.
Refactor watcher header menu entry refreshing.
Merge branch 'v3' into watcher