Improve shift-clicking for all core machines, 3/3.  Fixes #444.