Use a single SectionUrl object in the TOC, rather than per match
Merge pull request #653 from cmc333333/opt-toc-urls

Use a single SectionUrl object in the TOC, rather than per match