[FIX] XQuery, GH-1023: Do not optimize at run-time.
Merge pull request #1025 from LeoWoerteler/gh-1023

[FIX] XQuery, GH-1023: Do not optimize at run-time.