Simplify/remove hacks for reducing the spacing around section headings.