fixup! Move to OpaqueKey implementations from the external library