[MOD] XQuery, optimizing fn:remove()