hg: refactor annotation to generate a list of normalized annotation lines before iterating This makes it easier to add support for future annotion structures. Temporarily add redundant conditional to preserve formatting and reduce churn.