Counter watcher iterations, and set a limit.
Don't short-circuit watchers on mark.

Instead, restart after the full loop completes.