Remove content extensions, cut down on var calcs

The downside of this is document_content could have been used for doc previews.