diff --git a/swh/scheduler/utils.py b/swh/scheduler/utils.py
index cf9c502..07c4c7b 100644
--- a/swh/scheduler/utils.py
+++ b/swh/scheduler/utils.py
@@ -1,74 +1,75 @@
 # Copyright (C) 2017-2018  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 from datetime import datetime, timezone
 
 
 def get_task(task_name):
     """Retrieve task object in our application instance by its fully
     qualified python name.
 
     Args:
         task_name (str): task's name (e.g
                          swh.loader.git.tasks.LoadDiskGitRepository)
 
     Returns:
         Instance of task
 
     """
     from swh.scheduler.celery_backend.config import app
     for module in app.conf.CELERY_IMPORTS:
         __import__(module)
     return app.tasks[task_name]
 
 
 def create_task_dict(type, policy, *args, **kwargs):
     """Create a task with type and policy, scheduled for as soon as
        possible.
 
     Args:
         type (str): Type of oneshot task as per swh-scheduler's db
                     table task_type's column (Ex: origin-update-git,
                     swh-deposit-archive-checks)
         policy (str): oneshot or recurring policy
 
     Returns:
         Expected dictionary for the one-shot task scheduling api
         (swh.scheduler.backend.create_tasks)
 
     """
+    task_extra = {}
+    for extra_key in ['priority', 'retries_left']:
+        if extra_key in kwargs:
+            extra_val = kwargs.pop(extra_key)
+            task_extra[extra_key] = extra_val
+
     task = {
         'policy': policy,
         'type': type,
         'next_run': datetime.now(tz=timezone.utc),
         'arguments': {
             'args': args if args else [],
             'kwargs': kwargs if kwargs else {},
         },
     }
-
-    for extra_key in ['priority', 'retries_left']:
-        if extra_key in kwargs:
-            extra_val = kwargs.pop(extra_key)
-            task[extra_key] = extra_val
-
+    task.update(task_extra)
     return task
 
 
 def create_oneshot_task_dict(type, *args, **kwargs):
     """Create a oneshot task scheduled for as soon as possible.
 
     Args:
         type (str): Type of oneshot task as per swh-scheduler's db
                     table task_type's column (Ex: origin-update-git,
                     swh-deposit-archive-checks)
 
     Returns:
         Expected dictionary for the one-shot task scheduling api
         (swh.scheduler.backend.create_tasks)
 
     """
     return create_task_dict(type, 'oneshot', *args, **kwargs)