A tiny bit more work on ToC-generation.