Minor cleanup of toc templating.