More faithful shift-J emulation.

Fixes #455