Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw

Conflicts:
	wrw/sp/cons.py

diff --cc wrw/sp/cons.py
index 4ae21b84e03adfe39d25c678e724743f1a119262,b9437bf16e23a4f3a06d5def19095683e2fca3d6..d8b30a81dceb716d205eafa985ee013134859291
--- 1/wrw/sp/cons.py
--- 2/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -63,8 -63,8 +63,8 @@@ class context(object)
              return
          new = self.nodefrom(child)
          if new is not None:
-             node.children.append(self.nodefrom(child))
+             node.children.append(new)
 -        elif isinstance(child, collections.abc.Iterable):
 +        elif isinstance(child, collections.Iterable):
              for ch in child:
                  self.addchild(node, ch)
          else: