Going one (large) step further than #153, I propose to remove all support for XML in the codebase, which would simplify things significantly.