Updates and improves code for Xorg/AX directory merge.