Convert Python types to proper Python type hierarchy.

Now much more inline with how CPython does types.