Fix FileChangeWatcher, checksPerWatch not static any more