add arity+keywords-includes? and use match