Give each class a unique name for its self-reference.
Start refactoring type assignments (work in progress).