This also allows us to remove xcb-xkb, since Xinput will now give us the appropriate XKB modifiers with each event.