diff --git a/src/engine.c b/src/engine.c
index 90c9b650ec7d97eb7eb20eafbdaa01059622dd9c..7c62114730673902fa120d6be5d867b8c2a932d4 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2723,12 +2723,14 @@ void engine_step(struct engine *e) {
     mask |= 1 << task_type_sub_self;
     mask |= 1 << task_type_sub_pair;
     mask |= 1 << task_type_ghost;
-    mask |= 1 << task_type_extra_ghost; /* Adding unnecessary things to the mask
-                                                  does not harm */
 
     submask |= 1 << task_subtype_density;
-    submask |= 1 << task_subtype_gradient;
     submask |= 1 << task_subtype_force;
+
+#ifdef EXTRA_HYDRO_LOOP
+    mask |= 1 << task_type_extra_ghost;
+    submask |= 1 << task_subtype_gradient;
+#endif
   }
 
   /* Add the tasks corresponding to self-gravity to the masks */
diff --git a/src/runner.c b/src/runner.c
index b2c7c5cd2f63a256b3a6b76b013bd27adb638321..b21d27403a6a81cb598d0bded8b7220a3a60db63 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1136,8 +1136,7 @@ void *runner_main(void *data) {
       /* Different types of tasks... */
       switch (t->type) {
         case task_type_self:
-          if (t->subtype == task_subtype_density) 
-	    runner_doself1_density(r, ci);
+          if (t->subtype == task_subtype_density) runner_doself1_density(r, ci);
 #ifdef EXTRA_HYDRO_LOOP
           else if (t->subtype == task_subtype_gradient)
             runner_doself1_gradient(r, ci);