Yes, Yves, you did it really well. There seems to be a <-sign missing from the start of your xml version line but otherwise it looks fine.
It's quite a trivial thing to fix now, so I assigned it to Worker Bee, since I can't fix and test it myself right at this moment.