Move xserver vars into a map.