Consolidate and simplify definitions of rules for true/false positive inclusion as part of classification
Merge new rules