All: Fix demos markup inconsistencies discovered by cheerio

Fixes gh-7211