A new module in https://github.com/github/codeql-coding-standards/pull/784 adds support for reducing noise from reports in macros, which A5-2-2 and RULE-1-2 both have logic to do. This module should be integrated and will offer improvements.