post-7507 cleanup

Fix of SI-7507 in d2faeb9ae6 allowed us to shave off a few lines of
boilerplate in the macro engine, the opportunity I gladly went for.