wip: macros and associated fallout