modified system type handling (window-system -> system-type).