What to do with X11?

I don't like the idea that we have two completely different behaviours
for W and X.

Cheers,
Ivan