Revert "Release 1.0.2.1, don't re-define XML constants."

This reverts commit 6cc657e2d3b1318287026314f9631e4339a33f0f.