Adds some working and markup fixes that I missed
in the initial commit for this issue.

(Follow-up to GH-6419)
(cherry picked from commit 1a5c4bdb)
Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>