Move onTraitToggled to Listening.

... And the resetting of Minions and Heroes to the ether.