Tweaks for #1638, Taxonomy field() handling for #971