More robust back-jump after yasnippet