WIP: Simplify arity function

Now that I've proven that the new approach to arity() is correct,
strip out the code that used the old approach.