I'm guessing these are ignored by the new router? we've kind of left the keybindings situation unresolved. I'm not sure I understand what the plan is, but maybe this PR in isolation would break Ctrl+S on master, which is not ideal.

I wouldn't want to see this commit include keybindings rework, but maybe the PR should avoid regressions (with a separate commit about keybindings).