Some of the design choices in IdentityMap are showing some age, and we can benefit from a lambda to save quite a bit of allocations.