Fix quality violations from opaque-keys