@rough-minister-58256: i started looking at this today to have something more attached to the TargetMacro bugfix... something that might let us replace them. but it was more of a rabbit hole than i thought