Refactor to use new ClaimsSet / AttributesClaim

Tidy up the existing code in preparation for the addition of a new
service type.