diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt
index 7acd15769b9..727d1eee166 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt
@@ -24,15 +24,15 @@ public class LexicalScope(val parentScope: LexicalScope?, val element: JetElemen
     private val d = (parentScope?.depth ?: 0) + 1
     val depth: Int get() = d
 
-    val lexicalScopeForContainingDeclaration: LexicalScope? by lazy { computeLexicalScopeForContainingDeclaration() }
-    private fun computeLexicalScopeForContainingDeclaration(): LexicalScope? {
+    val lexicalScopeForContainingDeclaration: LexicalScope? by lazy {
         var scope: LexicalScope? = this
         while (scope != null) {
             if (scope.element is JetDeclaration) {
-                return scope
+                return@lazy scope
             }
             scope = scope.parentScope
         }
-        return null
+
+        return@lazy null
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
index 06ad4ba3224..61c05cf6e2c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
@@ -27,8 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public final class DiagnosticFactoryToRendererMap {
-    private final Map<DiagnosticFactory<?>, DiagnosticRenderer<?>> map =
-            new HashMap<DiagnosticFactory<?>, DiagnosticRenderer<?>>();
+    private final Map<DiagnosticFactory<?>, DiagnosticRenderer<?>> map = new HashMap<DiagnosticFactory<?>, DiagnosticRenderer<?>>();
     private boolean immutable = false;
 
     private void checkMutability() {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
index de5b252d1fb..b21e7591696 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
@@ -91,7 +91,11 @@ public open class KotlinLightClassForExplicitDeclaration(
 
         var declaration: PsiElement? = JetPsiUtil.getTopmostParentOfTypes(
                 classOrObject,
-                javaClass<JetNamedFunction>(), javaClass<JetConstructor<*>>(), javaClass<JetProperty>(), javaClass<JetClassInitializer>(), javaClass<JetParameter>())
+                JetNamedFunction::class.java,
+                JetConstructor::class.java,
+                JetProperty::class.java,
+                JetClassInitializer::class.java,
+                JetParameter::class.java)
 
         if (declaration is JetParameter) {
             declaration = declaration.getStrictParentOfType<JetNamedDeclaration>()
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
index 26ae3767cc7..5e9b917cfda 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
@@ -362,9 +362,7 @@ public class LightClassUtil {
     }
 
     @NotNull
-    public static PsiTypeParameterList buildLightTypeParameterList(
-            PsiTypeParameterListOwner owner,
-            JetDeclaration declaration) {
+    public static PsiTypeParameterList buildLightTypeParameterList(PsiTypeParameterListOwner owner, JetDeclaration declaration) {
         LightTypeParameterListBuilder builder = new KotlinLightTypeParameterListBuilder(owner.getManager());
         if (declaration instanceof JetTypeParameterListOwner) {
             JetTypeParameterListOwner typeParameterListOwner = (JetTypeParameterListOwner) declaration;
diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
index 2222d51b01a..8ac0f4709fd 100644
--- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
@@ -25,18 +25,19 @@ import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient
 import org.jetbrains.kotlin.test.JetTestUtils
 import java.io.ByteArrayOutputStream
 import java.io.File
-import java.io.IOException
-import java.util.*
 
 public class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
     data class CompilerResults(val resultCode: Int, val out: String)
 
-    val daemonOptions by lazy { DaemonOptions(runFilesPath = tmpdir.absolutePath) }
-    val daemonJVMOptions by lazy { DaemonJVMOptions() }
-    val compilerId by lazy { CompilerId.makeCompilerId( File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"),
-                                                        File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-runtime.jar"),
-                                                        File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar")) }
+    val daemonOptions by lazy(LazyThreadSafetyMode.NONE) { DaemonOptions(runFilesPath = tmpdir.absolutePath) }
+    val daemonJVMOptions by lazy(LazyThreadSafetyMode.NONE) { DaemonJVMOptions() }
+    val compilerId by lazy(LazyThreadSafetyMode.NONE) {
+        CompilerId.makeCompilerId(
+                File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"),
+                File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-runtime.jar"),
+                File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar"))
+    }
 
     private fun compileOnDaemon(args: Array<out String>): CompilerResults {
         System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "")