Minor cleanup of opaque-keys library

Which I suppose we should test works. I'll add that test.