Fixes and cleanups ... and support for legacy TaxonSet