Updated Display of Opaque Keys

@brianhw @dsjen @rocha @mulby 
This is putting a lot of trust into the hands of the developer to "do the right thing". We may disagree philosophically on this point, but I tend to prefer solutions that make it as hard as possible for other developers to do the wrong thing and as easy as possible for them to do the right thing.

If you are uncomfortable with the refactor due to the scope and the urgency of this patch, that's perfectly reasonable. In that case we should just file a dev story or something so that we can clean it up once there is less time pressure.