[MOD] XQuery Update: minor refactorings