This is easier to read and document in general, but will also make some new parsing work in wikiheaders much easier.