DOCX: Simplify markup for the common <p><span></span></p> case