Undo sorting types by inheritance until we figure out what's up with Sage.