diff --git a/Klein.php b/Klein.php
index 76947a2..ebe1601 100644
--- a/Klein.php
+++ b/Klein.php
@@ -27,11 +27,11 @@ class Klein {
             ["{% ifset+:var %}", "if(#1s !== null):"],
             ["{% if+:var %}", "if(#1s !== null && #1s):"],
             ["{% if+:id \(( :var (, :var )*)?\) %}", "if(macro_#1(#2s)):"],
-            ["{% unless+:var %}", "if(#1s !== null && #1s)):"],
+            ["{% unless+:var %}", "if(!(#1s !== null && #1s)):"],
             ["{% else %}", "else:"],
             ["{% endif %}", "endif;"],
             ["{{ :var }}", "echo #1s;"],
-            ["{{ :id \(( :var (, :var )*)?\) }}", "echo macro_#1(#2s);"],
+            ["{% :id \(( :var (, :var )*)?\) %}", "echo macro_#1(#2s);"],
             ["{{ :var\|:id }}", "echo #3(#1s);"],
             ["{% macro+:id \(( :id (, :id )*)?\) %}", "function macro_#1(#2s) {"],
             ["{% endmacro %}", "}"]