Sarina/opaque keys cleanup

@gwprice -- I Finally got #3861 merged :-\