Fix disposing of file system watchers (closes #590)