Fix `kind_from_type'