Tweak to the table of contents code, to create it more performantly.