Don't rely on X server adding empty variant for its defaults (#1011658)
    
    The X server keeps "matching" lists of layouts and variants that, when combined
    together, give a list of what is actually set for input handling. However, for
    the default layout, the X server doesn't add the empty "" variant to make the
    lists actually matching.