WP-2857: remove taxonomy wrapper.
WP-2857: update comment.