diff --git a/src/kiss/Kiss.hx b/src/kiss/Kiss.hx
index e9554d3..5ec83fb 100644
--- a/src/kiss/Kiss.hx
+++ b/src/kiss/Kiss.hx
@@ -59,6 +59,7 @@ class Kiss {
                 "reversed" => Symbol("Prelude.reversed"), // TODO test reversed
                 "memoize" => Symbol("Prelude.memoize"), // TODO test memoize
                 "symbolName" => Symbol("Prelude.symbolName"),
+                "symbolNameValue" => Symbol("Prelude.symbolNameValue"),
                 "symbol" => Symbol("Prelude.symbol"),
                 "expList" => Symbol("Prelude.expList"),
                 "map" => Symbol("Lambda.map"),
diff --git a/src/kiss/KissInterp.hx b/src/kiss/KissInterp.hx
index d8bd75d..b251774 100644
--- a/src/kiss/KissInterp.hx
+++ b/src/kiss/KissInterp.hx
@@ -26,7 +26,6 @@ class KissInterp extends Interp {
                 toDynamic: Operand.toDynamic
             }
         });
-        trace(variables["kiss"]);
         variables.set("Lambda", Lambda);
         variables.set("Std", Std);
         variables.set("Keep", ExtraElementHandling.Keep);
diff --git a/src/kiss/Macros.hx b/src/kiss/Macros.hx
index f746698..d0a66d5 100644
--- a/src/kiss/Macros.hx
+++ b/src/kiss/Macros.hx
@@ -189,15 +189,17 @@ class Macros {
             var conditionInterp = new KissInterp(true);
             var conditionStr = Reader.toString(conditionExp.def);
             for (flag => value in Context.getDefines()) {
-                conditionInterp.variables.set(flag, value);
+                if (flag != "kiss")
+                    conditionInterp.variables.set(flag, value);
             }
             try {
                 var hscriptStr = Prelude.convertToHScript(conditionStr);
                 #if test
-                Prelude.print(hscriptStr);
+                Prelude.print("#if condition hscript: " + hscriptStr);
                 #end
                 var conditionHScript = parser.parseString(hscriptStr);
                 return if (Prelude.truthy(conditionInterp.execute(conditionHScript))) {
+                    trace("using thenExp");
                     thenExp;
                 } else {
                     elseExp;
@@ -239,10 +241,15 @@ class Macros {
                 caseInterp.variables.set(Prelude.symbolNameValue(matchBodySymbol), matchBodies.shift());
             }
             for (flag => value in Context.getDefines()) {
-                caseInterp.variables.set(flag, value);
+                if (flag != "kiss")
+                    caseInterp.variables.set(flag, value);
             }
             try {
-                var caseHScript = parser.parseString(Prelude.convertToHScript(caseStr));
+                var hscriptStr = Prelude.convertToHScript(caseStr);
+                #if test
+                Prelude.print("#case hscript: " + hscriptStr);
+                #end
+                var caseHScript = parser.parseString(hscriptStr);
                 return caseInterp.execute(caseHScript);
             } catch (e) {
                 throw CompileError.fromExp(caseExp, '#case evaluation threw error $e');