Index: main/org-autofocus.el
===================================================================
--- main/org-autofocus.el	(revision main,8)
+++ main/org-autofocus.el	(revision main,9)
@@ -21,4 +21,16 @@
 (put 'org-af-marked 'org-af-marked t)
 (put 'org-af-marked 'display "*")
+
+(defun org-af--mark (point)
+  "Mark the task at POINT."
+  (add-text-properties point (1+ point) '(category org-af-marked)))
+
+(defun org-af--unmark (point)
+  "Unmark the task at POINT."
+  (remove-text-properties point (1+ point) '(category org-af-marked)))
+
+(defun org-af--marked-p (point)
+  "Test whether the task at POINT is marked."
+  (get-text-property point 'org-af-marked))
 
 
@@ -58,10 +70,8 @@
         bol marked)
     (unless (org-af--dimmed-p task-point)
-      (setq marked (not (get-text-property task-point 'org-af-marked)))
+      (setq marked (not (org-af--marked-p task-point)))
       (if marked
-          (add-text-properties task-point (1+ task-point)
-                               '(category org-af-marked))
-        (remove-text-properties task-point (1+ task-point)
-                                '(category org-af-marked)))
+          (org-af--mark task-point)
+        (org-af--unmark task-point))
 
       (save-excursion
@@ -70,7 +80,7 @@
                     (setq bol (line-beginning-position))
                     (get-text-property bol 'type)
-                    (not (get-text-property bol 'org-af-marked))))
+                    (not (org-af--marked-p bol))))
 
-        (when (get-text-property bol 'org-af-marked)
+        (when (org-af--marked-p bol)
           (if marked
               (org-af--dim bol (line-end-position))