diff --git a/cyclone.scm b/cyclone.scm
index 71c5565f..6c0d3259 100644
--- a/cyclone.scm
+++ b/cyclone.scm
@@ -233,10 +233,9 @@
       (trace:info "---------------- after closure-convert:")
       (trace:info input-program) ;pretty-print
       
-      (if (not *do-code-gen*)
-        (begin
-          (trace:error "DEBUG, existing program")
-          (exit 0)))
+      (when (not *do-code-gen*)
+        (trace:error "DEBUG, existing program")
+        (exit 0))
     
       (trace:info "---------------- C code:")
       (mta:code-gen input-program 
diff --git a/scheme/cyclone/util.sld b/scheme/cyclone/util.sld
index b8f1747d..830ebb88 100644
--- a/scheme/cyclone/util.sld
+++ b/scheme/cyclone/util.sld
@@ -117,13 +117,13 @@
 
 ; gensym : symbol -> symbol
 (define gensym (lambda params
-                 (if (null? params)
-                     (begin
+                 (cond
+                  ((null? params)
                        (set! gensym-count (+ gensym-count 1))
                        (string->symbol (string-append
                                         "$"
                                         (number->string gensym-count))))
-                     (begin
+                  (else
                        (set! gensym-count (+ gensym-count 1))
                        (string->symbol (string-append 
                                         (if (symbol? (car params))