Moved out the XPathQuery and reduced the Swig warnings to 1.