Remove gathering capacity from elephant archers as they are way too clumsy for that (as they would use the melee/slaughter attack too).
It might be unexpected in the first place to let them gather.
(However that is not really weirder than having cavalry hunt sheep.)