Simplified <p> content model

Eliminated choice and text - both were already part of m.para.content.