Move code to create DCPContent or (non-still) ImageContent into content_factory().