Fix key events for modifiers

We were interpreting them as "Ctrl+Control" rather than just "Control" (i.e. both the modifier and the key). This changes these cases to just provide the key, so we can also identify these events correctly.