Bug raised by Craig: catch Cmd/Ctrl keys before they reach old code