I can also drop Xaara's sword-savy trait if needed. Her character is developing in my head differently, so I don't need to justify the sword anymore.