You need to guard the calls to subr-arity with subrp, and then your
code will be future-proof.

Eh, not really. Even if I catch the signal, it will still stop working in the way it did before.

Patches to add func-arity to Emacs are welcome.

Ok, I'll see if I can do it.

Paul