This change make the code more similar to upstream Xorg which helps
when merging in changes from later Xorg releases.