Revert "Do a general cleanup of watch(8)."

This reverts commit 713ba243b79a56029066f74c642019b3fc99e4e3.