WIP: Auto margins on headings that come after a last-of-type paragraph?

I raised this a couple of weeks back - This was the reason given: