Improved control-key handling.