[FIX] XQuery: too greedy optimization of EQNames. Closes #744
[MIN] XQuery: renaming static context variables