Cleanup: fix some "leaking this" warnings

compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt

@@ -54,6 +54,10 @@ abstract class KtCodeFragment(
         }
     }
 
+    override final fun init(elementType: IElementType, contentElementType: IElementType?) {
+        super.init(elementType, contentElementType)
+    }
+
     private var resolveScope: GlobalSearchScope? = null
     private var thisType: PsiType? = null
     private var superType: PsiType? = null

compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt

@@ -27,12 +27,13 @@ fun PropertyDescriptor.asImportedFromObject(original: PropertyImportedFromObject
 
 abstract class ImportedFromObjectCallableDescriptor<out TCallable : CallableMemberDescriptor>(
         val callableFromObject: TCallable,
-        originalOrNull: TCallable?
+        private val originalOrNull: TCallable?
 ) : CallableDescriptor {
 
     val containingObject = callableFromObject.containingDeclaration as ClassDescriptor
 
-    protected val _original = originalOrNull ?: this
+    protected val _original
+        get() = originalOrNull ?: this
 }
 
 // members imported from object should be wrapped to not require dispatch receiver