Updated to use the xwl2 merged master.