Markdown reader: Slight rewrite of enclosure/emphOrStrong code.

Semantics should be the same.
Markdown reader:  Fixed regression with intraword underscores.

Closes #1121.