Incorporates most of the requested changes from @mcdurdin's recent PR review.

There's still a bit of work to do on supporting proper CAPS_LOCK state upon element refocusing, as with switching tabs.