Use the same setup for watching files as we use for running everything.
Stick the check for the right files earlier in the process.
Have to update modified to change the logic, Darren.