[FIX] XQuery, Suppress internal variable names in error msg. Closes #822