fixup! Opaque-keys megacommit