Submitted #34 to reformat all paragraphs. I can rebase this once it lands.