Update to use separate free_macros crate