Modernize IdentityCodecUtil a bit