Make type hierarchy corrections

A couple of corrections that (unless I'm mistaken) look like they were intended to be made.