Jump to mark motion shouldn't mix with mappings.

Use the NO_KEYMAP workaround once more so that jump to mark doesn't
pull in a mapping from the normal mode.

Add a test for the mark case and 'all ad-hoc matching between s'.

Fixes #425.