@abenari, is this change ok?  It what cases previously was `taxonomy` more than one.  I remember I challenged this in the past, but there were cases where `taxonomy` was more than a single instance.  Otherwise, Array.wrap and .map is not needed.