diff --git a/neutgs/init.fnl b/neutgs/init.fnl
index b2dd331..d0fb69d 100644
--- a/neutgs/init.fnl
+++ b/neutgs/init.fnl
@@ -31,7 +31,7 @@
 
   (fn wait-for-key ()
     (FlushEvents keyDownMask 0)
-    (while (not (GetOSEvent keyDownMask (far-ref event-buffer)))))
+    (while (not (GetNextEvent keyDownMask (far-ref event-buffer)))))
 
   (const screen-addr 0xe12000)
   (const screen-size 0x9d00)
diff --git a/ssc/init.fnl b/ssc/init.fnl
index 79736fe..478e48b 100644
--- a/ssc/init.fnl
+++ b/ssc/init.fnl
@@ -173,7 +173,7 @@
               ropgen (self:push-opgen rhs)
               pre (when ropgen.setup (ropgen.setup))
               lopgen (self:expr-opgen lhs)
-              left (when lopgen.setup (lopgen.setup) (if ropgen.hi :long :word))
+              left (when lopgen.setup (lopgen.setup))
               truebranch (if ropgen.cleanup (.. :-if-true-cleanup- depth) truelabel)
               falsebranch (if ropgen.cleanup (.. :-if-false-cleanup- depth) falselabel)
               hibranch (when lopgen.hi