F40 Proposal: Revitalize Forge Macros (Self-Contained Change proposal)