Complements mutter!420 (merged)
Some minor fixes to move X11 aside just enough and adapt to new API there.