Fix issue with file system observer always choosing the fallback observer.
Fix issue with OSX FSEvents class name conflicts.