DEV: Simplify watched word code (PR #13103)

Watched words with the recent changes became a bit more complex than it needs to be. In this PR I removed a lot of dead or duplicated code.

It also contains code of another PR, so I will leave this as a draft until the other one is merged.