diff --git a/applenews.admin.inc b/applenews.admin.inc
index 21adfae..e0e28ed 100644
--- a/applenews.admin.inc
+++ b/applenews.admin.inc
@@ -1128,7 +1128,8 @@ function applenews_download_article_json($entity_type, $entity_id, $revision_id)
 
     if ($export = applenews_entity_get_export($entity_type, $entity_id)) {
       try {
-        $data = applenews_entity_export($export, $entity_type, $entity_id);
+        $entity = entity_load_single($entity_type, $entity_id);
+        $data = applenews_entity_export($export, $entity);
         $archive_path = applenews_export_to_file($entity_id, [$entity_id], NULL, TRUE, $data);
         if (!$archive_path) {
           // Yuck.
diff --git a/applenews.batch.inc b/applenews.batch.inc
index d99b5d9..58f4de4 100755
--- a/applenews.batch.inc
+++ b/applenews.batch.inc
@@ -266,7 +266,7 @@ function applenews_batch_preview_generate($export_id, $entity_type, $entity, $to
   );
 
   try {
-    $data = applenews_entity_export($export, $entity_type, $entity_wrapper->getIdentifier());
+    $data = applenews_entity_export($export, $entity);
 
     $context['results']['export_id'] = $export->id;
     $context['results']['entity_ids'][] = $entity_wrapper->getIdentifier();
diff --git a/applenews.inc b/applenews.inc
index 68af3f0..3e5068b 100644
--- a/applenews.inc
+++ b/applenews.inc
@@ -583,10 +583,8 @@ function applenews_entity_export_valid(ApplenewsExport $export, $entity_type, $e
  *
  * @param ApplenewsExport $export
  *   Export to run.
- * @param string $entity_type
- *   Entity type.
- * @param string $entity_id
- *   Entity ID.
+ * @param object $entity
+ *   Entity object which is the source of the export.
  *
  * @return array
  *   With keys:
@@ -595,8 +593,7 @@ function applenews_entity_export_valid(ApplenewsExport $export, $entity_type, $e
  *
  * @throws ApplenewsInvalidExport
  */
-function applenews_entity_export(ApplenewsExport $export, $entity_type, $entity_id) {
-  $entity = entity_load_single($entity_type, $entity_id);
+function applenews_entity_export(ApplenewsExport $export, $entity) {
   $export->setSource($entity);
   try {
     return [
@@ -895,8 +892,7 @@ function applenews_op($operation, $channel_id, $entity, $entity_type, ApplenewsE
 
   $data = NULL;
   if ($operation != 'delete') {
-    $data = applenews_entity_export($export, $entity_type,
-      $entity_wrapper->getIdentifier());
+    $data = applenews_entity_export($export, $entity);
     if (!empty($settings['metadata'])) {
       $data['metadata'] = json_encode($settings['metadata']);
     }