I moved the XPath node definition out to its own file and quashed the last SWIG warning. I Still have one more class to move, and all the implementations.