--- a/rqlrewrite.py	Wed Nov 09 17:34:08 2011 +0100
+++ b/rqlrewrite.py	Wed Nov 09 18:41:12 2011 +0100
@@ -54,6 +54,7 @@
             if varname not in newroot.defined_vars or eschema(etype).final:
                 continue
             allpossibletypes.setdefault(varname, set()).add(etype)
+    # XXX could be factorized with add_etypes_restriction from rql 0.31
     for varname in sorted(allpossibletypes):
         var = newroot.defined_vars[varname]
         stinfo = var.stinfo

--- a/server/repository.py	Wed Nov 09 17:34:08 2011 +0100
+++ b/server/repository.py	Wed Nov 09 18:41:12 2011 +0100
@@ -528,6 +528,8 @@
         This is a public method, not requiring a session id.
         """
         # XXX we may want to check we don't give sensible information
+        # XXX the only cube using 'foreid', apycot, stop used this, we probably
+        # want to drop this argument
         if foreid is None:
             return self.config[option]
         _, sourceuri, extid, _ = self.type_and_source_from_eid(foreid)