Restore the changes from commit f3033568.

Now that Markdown lib has fixed display-xexpr.