Fix more set->trait_set