Initial XML changes to force into 1.6.2.

Now for the dirty part!