Minor cleanup and fix for blockquote/pre interaction (wikitext, 20db47c)

This cleanup includes a fix for some odd interaction in one case: a blockquote block containing paragraphs alternating with nested pre blocks.

Signed-off-by: Greg Hurrell <greg@hurrell.net>