Move wgxpath back from xpath-range module