Deal with species agnostic classes a bit differently
* #1083