Removes calls to markupNormal

markupNormal ended up not being as flexible as I needed it to be for
the blocks. Blocks need to support custom HTML being passed to them
and markupNormal does not take an optional HTML argument.