Get closer to true ORM

Instead of passing around both author and content, have author to
be a property of content.