More xdpyinfo removal.