Further shift-clicking polish.