WIP update for sysutils/watchman. Incomplete.
