npostavs@users.sourceforge.net writes:

> Here's a patch to split out dwim behaviour into separate commands.  I'm
> not sure if we should favour safety or convenience for the default
> keybindings.

Here's a non-broken version of that: