Make content support inline content as well as paragraph content.

The first part of hitting #1