diff --git a/src/commands/cmdsethandler.py b/src/commands/cmdsethandler.py
index 7a4c4c91fe..8acf3a528b 100644
--- a/src/commands/cmdsethandler.py
+++ b/src/commands/cmdsethandler.py
@@ -249,7 +249,7 @@ class CmdSetHandler(object):
                 self.cmdset_stack = []
                 for pos, path in enumerate(storage):
                     if pos == 0 and not path:
-                        self.cmdset_stack = [EmptyCmdSet(cmdsetobj=self.obj)]
+                        self.cmdset_stack = [_EmptyCmdSet(cmdsetobj=self.obj)]
                     elif path:
                         cmdset = self._import_cmdset(path)
                         if cmdset:
@@ -415,9 +415,9 @@ class CmdSetHandler(object):
                 else:
                     storage = [""]
                 self.cmdset_storage = storage
-            self.cmdset_stack[0] = EmptyCmdSet(cmdsetobj=self.obj)
+            self.cmdset_stack[0] = _EmptyCmdSet(cmdsetobj=self.obj)
         else:
-            self.cmdset_stack = [EmptyCmdSet(cmdsetobj=self.obj)]
+            self.cmdset_stack = [_EmptyCmdSet(cmdsetobj=self.obj)]
         self.update()
 
     def all(self):
diff --git a/src/utils/utils.py b/src/utils/utils.py
index 21b0ee6ad8..9db208a2dc 100644
--- a/src/utils/utils.py
+++ b/src/utils/utils.py
@@ -494,7 +494,10 @@ def delay(delay=2, retval=None, callback=None):
       callback (func(retval)) - if given, this will be called with retval
                                 after delay seconds
     Returns:
-      deferred that will fire with to_return after delay seconds
+      deferred that will fire with callback after delay seconds. Note that
+      if delay() is used in the commandhandler callback chain, the callback
+      chain can be defined directly in the command body and don't need to be
+      specified here.
     """
     d = defer.Deferred()
     callb = callback or d.callback