I think we'd make a new macro from concrete model objects, its a pain but worth doing if it makes a big difference