I did a very small amount of refactoring cleanup. The code is really disorganized and it's not at all clear to me how to improve it.

More importantly, though: I did decide to add Markdown support. It was very easy thanks to the Markdig project.