Block on all top-level static methods
Fix blocking on window
Disambiguate TUs by their props, if present
Add Eclipse support files