Fix MRO issue

We now preserve the MRO for base-classes on the IsA relationships to ensure they come back in the correct order.