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