Replace unnecessary uses of TraitObject
with casts
#36005
Merged
TraitObject
with casts
#36005