Make usage of taxonomies a bit less strict, again. Addendum to #670.