Be more careful about how we watch to try to avoid unnecessary work; thanks @DutchProgrammer!

Refs #5.