--- a/trunk/src/dil/semantic/Pass1.d	Fri Jan 18 23:11:44 2008 +0100
+++ b/trunk/src/dil/semantic/Pass1.d	Fri Jan 18 23:40:12 2008 +0100
@@ -334,7 +334,7 @@
   {
     if (e.type)
       return e.value;
-    switch (e.specialToken.type)
+    switch (e.specialToken.kind)
     {
     case TOK.LINE, TOK.VERSION:
       e.value = new IntExpression(e.specialToken.uint_, Types.Uint);
@@ -370,9 +370,7 @@
   {
     if (e.type)
       return e;
-    assert(e.begin !is null);
-    auto b = (e.begin.type == TOK.True) ? true : false;
-    e.value = new IntExpression(b, Types.Bool);
+    e.value = new IntExpression(e.toBool(), Types.Bool);
     e.type = Types.Bool;
     return e;
   }