[MOD] XQuery, Binary Module: aligned with the latest spec.