A few fixes for xor

These are all things that should be removed from the code, but that needs
the revsions doing properly!


git-svn-id: http://www.latex-project.org/svnroot/experimental/trunk@4578 de43f980-851b-0410-b2f7-c40aca1f87e0