Repair matching for fastly commands (service names have spaces and
this is annoying).