Bug434028 xquery syntax fix

Fixing the bugs from my last commit for implementing the syntax highlighting for xquery, according to Grant's Feedback: https://bugs.eclipse.org/bugs/show_bug.cgi?id=434028