Yet more conflict-detector heuristic tweakage.

Specifically, more focused reprocessing of header lists
once a header with one conflict is identified.
This cut inventory time on Solaris 11 from 80s to 58s.
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.