I'm also confused about why, for this specific repro case at least, fixing FileSystem along did not make the bug go away.  Once the duplicate watcher notifications are eliminated, wouldn't we only get here once?