Fix the modifier testing, that breaks the Super key as a modifier but it's the...

Fix the modifier testing, that breaks the Super key as a modifier but it's the only clean way to get something working reliably. Need to send a message to the ML or we shall get flooded with bug reports though...

(Old svn revision: 21403)