Clean up invalid HTML

[chalin]

For reported cases, see

• Shortcode 'feature': fix output of invalid nested <p> tags #526
• Shortcode 'lead' produces invalid HTML #527

But there are more similar instances of these (e.g., invalid use of <span>) as a quick regex search can confirm. I'm opening this issue as a reminder to track down similar issues found in other files.