diff --git a/src/Task.cpp b/src/Task.cpp
index ed4f1bb04..12fd51544 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1530,6 +1530,7 @@ void Task::validate (bool applyDefault /* = true */)
   else if (! has ("status") || get ("status") == "")
     status = Task::pending;
 
+  // Default to 'periodic' type recurrence.
   if (status == Task::recurring &&
       (! has ("rtype") || get ("rtype") == ""))
   {
@@ -1658,6 +1659,7 @@ void Task::validate (bool applyDefault /* = true */)
       Duration p;
       std::string::size_type i = 0;
       if (! p.parse (value, i))
+        // TODO Ideal location to map unsupported old recurrence periods to supported values.
         throw format (STRING_TASK_VALID_RECUR, value);
     }
   }
diff --git a/src/recur.cpp b/src/recur.cpp
index c0bb621a6..7eec836e5 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -75,7 +75,7 @@ void handleRecurrence ()
       // Generate a list of due dates for this recurring task, regardless of
       // the mask.
       std::vector <Datetime> due;
-      if (!generateDueDates (t, due))
+      if (! generateDueDates (t, due))
       {
         // Determine the end date.
         t.setStatus (Task::deleted);
diff --git a/src/recur2.cpp b/src/recur2.cpp
index 2282dc519..e66a2459e 100644
--- a/src/recur2.cpp
+++ b/src/recur2.cpp
@@ -30,21 +30,17 @@
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
-// Scans all tasks, and for any recurring tasks, determines whether any new
-// child tasks need to be generated to fill gaps.
-void handleRecurrence2 ()
+static void synthesizeTasks (const Task&)
 {
-  // Recurrence can be disabled.
-  // Note: This is currently a workaround for TD-44, TW-1520.
-  if (context.config.getBoolean ("recurrence"))
-  {
-    context.debug ("handleRecurrence2 start");
 
 
 
-
-    context.debug ("handleRecurrence2 end");
-  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Generates all necessary recurring task instances.
+void handleRecurrence2 ()
+{
 }
 
 ////////////////////////////////////////////////////////////////////////////////