fixup! Make Studio support opaque-keys