diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt
index 6f0c144970d..bdc9bce6946 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt
@@ -71,7 +71,7 @@ public fun JetElement.getDebugText(): String? {
         }
         return "package " + fqName.asString()
     }
-    return accept(DebugTextBuildingVisitor, Unit.VALUE)
+    return accept(DebugTextBuildingVisitor, Unit)
 }
 
 
@@ -341,4 +341,4 @@ private fun StringBuilder.appendInn(target: Any?, prefix: String = "", suffix: S
                else -> target.toString()
            })
     append(suffix)
-}
\ No newline at end of file
+}
diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
index 7053ddbc447..e5a891ae9bf 100644
--- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
@@ -128,7 +128,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
         assertType("\"d\"", builtIns.getStringType());
         assertType("\"\"\"d\"\"\"", builtIns.getStringType());
 
-        assertType("Unit.VALUE", KotlinBuiltIns.getInstance().getUnitType());
+        assertType("Unit", KotlinBuiltIns.getInstance().getUnitType());
 
         assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType());
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
index 96be84290f0..7bbdfc3e8a2 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
@@ -95,7 +95,7 @@ fun LookupElement.suppressAutoInsertion() = AutoCompletionPolicy.NEVER_AUTOCOMPL
 val KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY = Key<Unit>("KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY")
 
 fun LookupElement.keepOldArgumentListOnTab(): LookupElement {
-    putUserData(KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY, Unit.VALUE)
+    putUserData(KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY, Unit)
     return this
 }
 
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
index d023777bfad..9210e66ea86 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
@@ -48,10 +48,7 @@ class Html2CompilerPlugin(private val compilerArguments: KDocArguments) : Doclet
         val css = javaClass<Html2CompilerPlugin>().getClassLoader()!!.getResourceAsStream(
                 "org/jetbrains/kotlin/doc/highlighter2/hightlight.css")!!
 
-        File(srcOutputRoot, "highlight.css").write { outputStream ->
-            css.copyTo(outputStream)
-            Unit.VALUE
-        }
+        File(srcOutputRoot, "highlight.css").write { outputStream -> css.copyTo(outputStream) }
 
         for (sourceInfo in model.sourcesInfo) {
             processFile(sourceInfo)