Minor cleanup of opaque-keys library

Well that's unfortunate.