Eliminate a variable reuse in claims extraction

These two sets of claims should always be kept completely separate
so let's use separate variables at all times when handling them.