Merge pull request #2506 from tnull/2023-08-dont-leak-internal-macros