Completed the type hierarchy to a lattice, simplifying some
constructions.