[MOD] XQuery, parser: performance tweaks