Review Content class hierarchy

[rjyounes]

I find the Content hierarchy confusing:

• Should Address be a subclass of Text?
• Should Text be a subclass of FormattedContent or at least ContentExpression?
• What is the difference between Content and ContentExpression?

[rjyounes]

See also #1025.