Consistently use pokemon.name in the comparifier.

Everything the comparifier comparifies is about pokemon or species,
never forms.  Plus the first table was already using pokemon.name.