More cleaning up of the parsers and the TOC