Mods to speed up Specie comparison.
Automatic Py3k merge for testing