Use ByPropertyIdGrouper in Claims

This is less readable than before