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

(Follow-up to GH-6419)