xwayland: Shuffle some code around
wayland: Remove superfluous "wayland_" from arguments