Obey the exprArity invariants! Fixes Trac #5441