Almost done with arity parsing