[MOD] XQuery: aligned with new higher-order function signatures