Sarina/fix quality

Clean up quality violations and various TODOs from opaque-keys.