Various improvements to taxonomies.