Finish reworking name-based tracking of entities and relationships.
Unify attribute handling.