Improve shift-clicking for all core machines, fixes #444.