Minor cleanup of opaque-keys library