Core changes for NavigableTOC extension: