#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
19 files changed