[FIX] FLWOR rewritings, #961