refactoring claim_spec and claimant_spec to deal with new claimant collection i/f