Xwayland cleanups

Merged Michel Dänzer requested to merge daenzer/xserver:xwayland-cleanups into master

I noticed these cleanup opportunities while working on !458 (merged).

/cc @ofourdan

Merge request reports