Further improve the TOC.