The new macros have been merged, the function fix_service_macro is now break. We need to update it.
fix_service_macro