Some performance improvements to OpaqueKeys