Redid TraitAttack and TraitAttacked.