More keybinding refactors.

Looks like it was working after all.