--- a/__init__.py	Wed Apr 07 13:51:37 2010 +0200
+++ b/__init__.py	Thu Apr 08 13:34:35 2010 +0200
@@ -159,6 +159,8 @@
                             rhs = copy_uid_node(select, rhs, vconsts)
                             select.groupby[select.groupby.index(vref)] = rhs
                             rhs.parent = select
+                    elif rel is uidrel:
+                        uidrel.parent.remove(uidrel)
                     elif rel.is_types_restriction():
                         stinfo['typerel'] = None
                         rel.parent.remove(rel)
@@ -166,7 +168,6 @@
                         rhs = copy_uid_node(select, rhs, vconsts)
                         vref.parent.replace(vref, rhs)
                 del select.defined_vars[var.name]
-                uidrel.parent.remove(uidrel)
                 stinfo['uidrel'] = None
                 rewritten = True
                 if vconsts: