[thomastjeffery]

That's a viable workaround most of the time.

Unfortunately, it causes another problem: You can't use a keycode-based (as opposed to keysym) configuration without switching your keyboard back to qwerty.