Some claims parsing edge cases

[billyeh]

Came across this weird bug while I was testing application parsing, and don't think it goes well with the applications branch, so I made a separate pull request also just to see if this is what we should do, in, for example, this case that prompted this change:

A little below halfway down the screenshot is the claims list causing the error: there's a weird list of attributes that somehow gets pulled into there.

[billyeh]

Sorry, there's a merge commit in there. I think I'll rebase next time.

[gtfierro]

Thanks Bill!