Fix incremental analysis to work with unique definitions.
Cleanup unused URI projections.