Update to use holder-of-key.