Cleans up type tree a bit