Clear up some keyboard autotype issues I'd introduced