Rearranged simple-file-watcher.