Keypress handler fixes

Various fixes to the keypress handlers. I suggest cloning and reviewing each commit individually.

I can split this up if you'd like (but the commits all depend on the first one).