[PATCHv2] Use libxklavier's new methods instead of our nasty hack