Add Build watch support

Which means filter functions like this should belong in the lower level.