Much faster table of contents.

Change-Id: I06debfb01baad1bf03ed1cf6c9af41f0a835e56e