Fixes to Markdown parsing introduced in 7605177