Some more cleanup for XLIB too