Removing unnecessary content type indirection.