Fix combo_* calls within combos themselves