Revert "Simplified watch checks."

Hm. Must investigate. Or ignore. Cannot decide which.

This reverts commit 46a00e958d6876fd90a9d6c3b92ca8841f392d68.