Refactor validation to be more uniform

Specifically, species validation was a bit of an outlier. It has now
been brought back into the fold.