more rewrites

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