Fix 'table of contents' for Dexterity types. This commit manually merges the relevant commits from pabo and pbauer to the master branch. It was not possible to cherry-pick or automatically merge this.