X11 - display - replaced quirky references by macro