More cleanup, fix things broken in last cleanup

graphgif.scm

@@ -33,12 +33,11 @@
   (lambda (node)
     (cairo-set-source cr black)
     (let-values ([(x y) (car+cdr (node-coords node))]
-		 [edges (node-edges node)])
+		 [(edges) (node-edges node)])
       (for-each
        (lambda (edge)
-	 (let* ([other (assq-ref graph edge)]
-		[ox (car (node-coords other))]
-		[oy (cdr (node-coords other))])
+	 (let*-values ([(other) (assq-ref graph edge)]
+		       [(ox oy) (car+cdr (node-coords other))])
 	   (cairo-move-to cr x y)
 	   (cairo-line-to cr ox oy)
 	   (cairo-stroke cr)))
@@ -48,7 +47,7 @@
   "Creates a closure that draws the nodes of graph using cr"
   (lambda (node)
     (let-values ([(x y) (car+cdr (node-coords node))]
-		 [color (or (node-color node) white)])
+		 [(color) (or (node-color node) white)])
       (cairo-arc cr x y 4. 0. tau)
       (cairo-set-source cr color)
       (cairo-fill-preserve cr)