Cleanse the key binding save/restore code