As an aside, I think we should consider removing the "shift toggles the mode" behavior. I think it confuses a lot of people.