TOC tinkering some more.