Use the new macro creation API internally.