Couple additions to new shift-click behavior.