Improve handling of collapsing adjacent paragraph margins