Don't surround blocks with inlines.

We have this pattern of embedding `<p>`s in `<InfoTip>`, which was made
of `<span>`s.