Don't trim paragraph tags on multiple paragraphs

Fixes #803 (closed). Fixes #392 (closed).

Add a condition so the trim doesn't happen if there's there's an additional <p> tag anywhere between the start and end tag. I also took the liberty of slightly refactoring how the mtype is constructed to make it slightly cleaner.