Refactor Claim and EntityDeserializer

Please look at the 4 commits independently and tell me which are ok for you. I will remove the ones you are not ok with. Or you can just merge all of them. ;-)