Integrated upgrades from nexus-refactor-hadrien-delaitre Window and
XWindow.
Upgraded further.