Tweaks for #1060 to improve list of built-in taxonomies / associated post types when there are multiple listed