As a special case of #574, I've just had a look at the top-level core clauses. They have pretty obvious hanging paragraphs.
I'd suggest to introduce a "Preamble" section for each of these, with no further cleanup for the time being.