fix(keymap.helpers): improve _toggle* helper functions (#1397)

fix(keymap.helpers): improve _toggle* helper functions (#1397) #2657