I wanted to introduce the changes more gradually in preparation for the later changes which will attach/detach the clients to different toplevel surfaces. It's probably a matter of pulling more of the later changes in now, for instance attaching/detaching the client windows in wayland_win_data_update_wayland_surface
Ack, the above is what I meant.