I'll fix the other remarks first, and keep the tweaking of this for a PR after this one is merged i, since it seems like our views are not aligned on this, i.e., the exact format of the section markers, prefixed or not, order of the marker parts, etc.