Use opaque keys

LMS-11462

@jimabramson @nasthagiri plz review