The scrap heap has been removed in upstream, so our hack to remove it is no longer needed. O frabjous day!
Rev 21: Two sections have not only the same name but the same entire lineage---an apparent typo. Soften an error to a warning accordingly.
Rev. 21: Only do a particular assertion about margins predicting ilvl for numbered lists, not bulleted lists.