Remove some now redundant classes.
Allow model elements to project as different types.