Make wrong arity messages work again.

Closes PR14138.