Fix the XQuery class.