Reduce unnecessary usage of Claims class

The power of the `Claims` class is barely used here. Note the use of `iterator_to_array` to convert the object back into an array.