Agreed. I'll start a new branch with only the FileSystem and FileWatcherDomain fixes for https://github.com/adobe/brackets/issues/6554.