There should be a way to solve this one and avoid breaking backward compatibility. Maybe by checking `.arity?`, I haven't tried.