Minor cleanup of opaque-keys library

Yes, it is.