Improved coverage reporting

Before this change it was hard to keep track of whether a particular
rule that was reported had actually been cut/pasted into a new
position when refactoring the ruleset
Refactor all branch/tag rules that have a utilization of 1