Add type-hints to skip Java reflection; fix unwatch-files test