Fix arity+keywords-combine