Make annotation output less redundant.
Make annotation output less redundant.

Specifically, don't output a [conform]/[thread]/[conform,thread]
annotation that is a subset of a less tagged annotation.

Also refactor annotation output to be less repetitive code-wise.

zackw/header-survey,zackw/header-survey