Speed up adding file watchers. Fixes #1