[FIX] XQuery, Unit Module. Closes #974.