diff --git a/py/test/rsession/hostmanage.py b/py/test/rsession/hostmanage.py
index 3731bddb4..4ca5513bb 100644
--- a/py/test/rsession/hostmanage.py
+++ b/py/test/rsession/hostmanage.py
@@ -105,10 +105,10 @@ class HostManager(object):
         dist_remotepython = self.config.getvalue("dist_remotepython")
         for host in self.sshhosts:
             host.initgateway(python=dist_remotepython)
-            host.gw.host = host # XXX would like to avoid it
+            host.gw.host = host
 
     def init_rsync(self, reporter):
-        # send each rsync roots  
+        # send each rsync root  
         roots = self.config.getvalue_pathlist("dist_rsync_roots")
         if roots is None:
             roots = [self.config.topdir]
diff --git a/py/test/rsession/master.py b/py/test/rsession/master.py
index 27dccc533..1dbb8439a 100644
--- a/py/test/rsession/master.py
+++ b/py/test/rsession/master.py
@@ -33,8 +33,10 @@ class MasterNode(object):
             self.reporter(report.SendItem(self.channel, item))
 
 def itemgen(colitems, reporter, keyword, reporterror):
+    def rep(x):
+        reporterror(reporter, x)
     for x in colitems:
-        for y in x._tryiter(reporterror = lambda x: reporterror(reporter, x), keyword = keyword):
+        for y in x._tryiter(reporterror=rep, keyword=keyword):
             yield y
 
 def dispatch_loop(masternodes, itemgenerator, shouldstop, 
diff --git a/py/test/rsession/rsession.py b/py/test/rsession/rsession.py
index 49aba30f4..e5601bf1a 100644
--- a/py/test/rsession/rsession.py
+++ b/py/test/rsession/rsession.py
@@ -68,13 +68,13 @@ class AbstractSession(Session):
         return reporter, startserverflag
     
     def reporterror(reporter, data):
-            excinfo, item = data
-            if excinfo is None:
-                reporter(report.ItemStart(item))
-            elif excinfo.type is Skipped:
-                reporter(report.SkippedTryiter(excinfo, item))
-            else:
-                reporter(report.FailedTryiter(excinfo, item))
+        excinfo, item = data
+        if excinfo is None:
+            reporter(report.ItemStart(item))
+        elif excinfo.type is Skipped:
+            reporter(report.SkippedTryiter(excinfo, item))
+        else:
+            reporter(report.FailedTryiter(excinfo, item))
     reporterror = staticmethod(reporterror)
 
     def kill_server(self, startserverflag):