refactoring of macro self-references to make the code easier to follow #4256
===VersionHistory:None===