More set.xml cleanup

It never ends!