Improve contentelement parser: treat <p> specially