diff --git a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
index 4bca0e76794e64a40f32b56679d4a502d0b1590c..43d977fb3a273014e8d7e2874e05996268c0b465 100644
--- a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
+++ b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
@@ -1092,11 +1092,11 @@ trait CodeExtraction extends ASTExtractors {
           }
 
           val restTree = rest match {
-            case Some(rst) => {
+            case Some(rst) =>
               val nctx = dctx.withNewVar(vs -> (() => Variable(newID)))
               extractTree(rst)(nctx)
-            }
-            case None => UnitLiteral()
+            case None =>
+              UnitLiteral()
           }
 
           rest = None
@@ -1765,6 +1765,9 @@ trait CodeExtraction extends ASTExtractors {
       case tpe if tpe == NothingClass.tpe =>
         Untyped
 
+      case ct: ConstantType =>
+        extractType(ct.value.tpe)
+
       case TypeRef(_, sym, _) if isBigIntSym(sym) =>
         IntegerType