WIP 4375 - Parameterized Macro Tags

Submitting WIP 4375 for reference by the community.