Some wstring fixes for Xpath.cpp.