diff --git a/core/builtins/native/kotlin/Char.kt b/core/builtins/native/kotlin/Char.kt
index 830a76ab147..9bf363427fb 100644
--- a/core/builtins/native/kotlin/Char.kt
+++ b/core/builtins/native/kotlin/Char.kt
@@ -17,66 +17,66 @@
 package kotlin
 
 public class Char private () : Comparable<Char> {
-    public fun compareTo(other : Double) : Int
-    public fun compareTo(other : Float)  : Int
-    public fun compareTo(other : Long)    : Int
-    public fun compareTo(other : Int)    : Int
-    public fun compareTo(other : Short)  : Int
-    public override fun compareTo(other : Char)  : Int
-    public fun compareTo(other : Byte)   : Int
+    public fun compareTo(other: Double): Int
+    public fun compareTo(other: Float) : Int
+    public fun compareTo(other: Long)  : Int
+    public fun compareTo(other: Int)   : Int
+    public fun compareTo(other: Short) : Int
+    public override fun compareTo(other: Char): Int
+    public fun compareTo(other: Byte)  : Int
 
-    public fun plus(other : Double) : Double
-    public fun plus(other : Float)  : Float
-    public fun plus(other : Long)   : Long
-    public fun plus(other : Int)    : Int
-    public fun plus(other : Short)  : Int
-    public fun plus(other : Byte)   : Int
-    //  public fun plus(other : Char)   : Int
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Float
+    public fun plus(other: Long)  : Long
+    public fun plus(other: Int)   : Int
+    public fun plus(other: Short) : Int
+    public fun plus(other: Byte)  : Int
+    //  public fun plus(other: Char)  : Int
 
-    public fun minus(other : Double) : Double
-    public fun minus(other : Float)  : Float
-    public fun minus(other : Long)   : Long
-    public fun minus(other : Int)    : Int
-    public fun minus(other : Short)  : Int
-    public fun minus(other : Byte)   : Int
-    public fun minus(other : Char)   : Int
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Float
+    public fun minus(other: Long)  : Long
+    public fun minus(other: Int)   : Int
+    public fun minus(other: Short) : Int
+    public fun minus(other: Byte)  : Int
+    public fun minus(other: Char)  : Int
 
-    public fun times(other : Double) : Double
-    public fun times(other : Float)  : Float
-    public fun times(other : Long)   : Long
-    public fun times(other : Int)    : Int
-    public fun times(other : Short)  : Int
-    public fun times(other : Byte)   : Int
-    //  public fun times(other : Char)   : Int
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Float
+    public fun times(other: Long)  : Long
+    public fun times(other: Int)   : Int
+    public fun times(other: Short) : Int
+    public fun times(other: Byte)  : Int
+    //  public fun times(other: Char)  : Int
 
-    public fun div(other : Double) : Double
-    public fun div(other : Float)  : Float
-    public fun div(other : Long)   : Long
-    public fun div(other : Int)    : Int
-    public fun div(other : Short)  : Int
-    public fun div(other : Byte)   : Int
-    //  public fun div(other : Char)   : Int
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Float
+    public fun div(other: Long)  : Long
+    public fun div(other: Int)   : Int
+    public fun div(other: Short) : Int
+    public fun div(other: Byte)  : Int
+    //  public fun div(other: Char)  : Int
 
-    public fun mod(other : Double) : Double
-    public fun mod(other : Float)  : Float
-    public fun mod(other : Long)   : Long
-    public fun mod(other : Int)    : Int
-    public fun mod(other : Short)  : Int
-    public fun mod(other : Byte)   : Int
-    //  public fun mod(other : Char)   : Int
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Float
+    public fun mod(other: Long)  : Long
+    public fun mod(other: Int)   : Int
+    public fun mod(other: Short) : Int
+    public fun mod(other: Byte)  : Int
+    //  public fun mod(other: Char)  : Int
 
-    public fun rangeTo(other : Char)   : CharRange
+    public fun rangeTo(other: Char): CharRange
 
-    public fun inc() : Char
-    public fun dec() : Char
-    public fun plus() : Int
-    public fun minus() : Int
+    public fun inc(): Char
+    public fun dec(): Char
+    public fun plus(): Int
+    public fun minus(): Int
 
-    public fun toDouble() : Double
-    public fun toFloat() : Float
-    public fun toLong() : Long
-    public fun toInt() : Int
-    public fun toChar() : Char
-    public fun toShort() : Short
-    public fun toByte() : Byte
+    public fun toDouble(): Double
+    public fun toFloat(): Float
+    public fun toLong(): Long
+    public fun toInt(): Int
+    public fun toChar(): Char
+    public fun toShort(): Short
+    public fun toByte(): Byte
 }
diff --git a/core/builtins/native/kotlin/Collections.kt b/core/builtins/native/kotlin/Collections.kt
index 3b904470ea1..16bdcdf757b 100644
--- a/core/builtins/native/kotlin/Collections.kt
+++ b/core/builtins/native/kotlin/Collections.kt
@@ -17,149 +17,149 @@
 package kotlin
 
 public trait Iterable<out T> {
-    public fun iterator() : Iterator<T>
+    public fun iterator(): Iterator<T>
 }
 
 public trait MutableIterable<out T> : Iterable<T> {
-    override fun iterator() : MutableIterator<T>
+    override fun iterator(): MutableIterator<T>
 }
 
 public trait Collection<out E> : Iterable<E> {
     // Query Operations
-    public fun size() : Int
-    public fun isEmpty() : Boolean
-    public fun contains(o : Any?) : Boolean
-    override fun iterator() : Iterator<E>
+    public fun size(): Int
+    public fun isEmpty(): Boolean
+    public fun contains(o: Any?): Boolean
+    override fun iterator(): Iterator<E>
 
     // Bulk Operations
-    public fun containsAll(c : Collection<Any?>) : Boolean
+    public fun containsAll(c: Collection<Any?>): Boolean
 }
 
 public trait MutableCollection<E> : Collection<E>, MutableIterable<E> {
     // Query Operations
-    override fun iterator() : MutableIterator<E>
+    override fun iterator(): MutableIterator<E>
 
     // Modification Operations
-    public fun add(e : E) : Boolean
-    public fun remove(o : Any?) : Boolean
+    public fun add(e: E): Boolean
+    public fun remove(o: Any?): Boolean
 
     // Bulk Modification Operations
-    public fun addAll(c : Collection<E>) : Boolean
-    public fun removeAll(c : Collection<Any?>) : Boolean
-    public fun retainAll(c : Collection<Any?>) : Boolean
-    public fun clear() : Unit
+    public fun addAll(c: Collection<E>): Boolean
+    public fun removeAll(c: Collection<Any?>): Boolean
+    public fun retainAll(c: Collection<Any?>): Boolean
+    public fun clear(): Unit
 }
 
 public trait List<out E> : Collection<E> {
     // Query Operations
-    override fun size() : Int
-    override fun isEmpty() : Boolean
-    override fun contains(o : Any?) : Boolean
-    override fun iterator() : Iterator<E>
+    override fun size(): Int
+    override fun isEmpty(): Boolean
+    override fun contains(o: Any?): Boolean
+    override fun iterator(): Iterator<E>
 
     // Bulk Operations
-    override fun containsAll(c : Collection<Any?>) : Boolean
+    override fun containsAll(c: Collection<Any?>): Boolean
 
     // Positional Access Operations
-    public fun get(index : Int) : E
+    public fun get(index: Int): E
 
     // Search Operations
-    public fun indexOf(o : Any?) : Int
-    public fun lastIndexOf(o : Any?) : Int
+    public fun indexOf(o: Any?): Int
+    public fun lastIndexOf(o: Any?): Int
 
     // List Iterators
-    public fun listIterator() : ListIterator<E>
-    public fun listIterator(index : Int) : ListIterator<E>
+    public fun listIterator(): ListIterator<E>
+    public fun listIterator(index: Int): ListIterator<E>
 
     // View
-    public fun subList(fromIndex : Int, toIndex : Int) : List<E>
+    public fun subList(fromIndex: Int, toIndex: Int): List<E>
 }
 
 public trait MutableList<E> : List<E>, MutableCollection<E> {
     // Modification Operations
-    override fun add(e: E) : Boolean
-    override fun remove(o : Any?) : Boolean
+    override fun add(e: E): Boolean
+    override fun remove(o: Any?): Boolean
 
     // Bulk Modification Operations
-    override fun addAll(c : Collection<E>) : Boolean
-    public fun addAll(index : Int, c : Collection<E>) : Boolean
-    override fun removeAll(c : Collection<Any?>) : Boolean
-    override fun retainAll(c : Collection<Any?>) : Boolean
-    override fun clear() : Unit
+    override fun addAll(c: Collection<E>): Boolean
+    public fun addAll(index: Int, c: Collection<E>): Boolean
+    override fun removeAll(c: Collection<Any?>): Boolean
+    override fun retainAll(c: Collection<Any?>): Boolean
+    override fun clear(): Unit
 
     // Positional Access Operations
-    public fun set(index : Int, element : E) : E
-    public fun add(index : Int, element : E) : Unit
-    public fun remove(index : Int) : E
+    public fun set(index: Int, element: E): E
+    public fun add(index: Int, element: E): Unit
+    public fun remove(index: Int): E
 
     // List Iterators
-    override fun listIterator() : MutableListIterator<E>
-    override fun listIterator(index : Int) : MutableListIterator<E>
+    override fun listIterator(): MutableListIterator<E>
+    override fun listIterator(index: Int): MutableListIterator<E>
 
     // View
-    override fun subList(fromIndex : Int, toIndex : Int) : MutableList<E>
+    override fun subList(fromIndex: Int, toIndex: Int): MutableList<E>
 }
 
 public trait Set<out E> : Collection<E> {
     // Query Operations
-    override fun size() : Int
-    override fun isEmpty() : Boolean
-    override fun contains(o : Any?) : Boolean
-    override fun iterator() : Iterator<E>
+    override fun size(): Int
+    override fun isEmpty(): Boolean
+    override fun contains(o: Any?): Boolean
+    override fun iterator(): Iterator<E>
 
     // Bulk Operations
-    override fun containsAll(c : Collection<Any?>) : Boolean
+    override fun containsAll(c: Collection<Any?>): Boolean
 }
 
 public trait MutableSet<E> : Set<E>, MutableCollection<E> {
     // Query Operations
-    override fun iterator() : MutableIterator<E>
+    override fun iterator(): MutableIterator<E>
 
     // Modification Operations
-    override fun add(e: E) : Boolean
-    override fun remove(o : Any?) : Boolean
+    override fun add(e: E): Boolean
+    override fun remove(o: Any?): Boolean
 
     // Bulk Modification Operations
-    override fun addAll(c : Collection<E>) : Boolean
-    override fun removeAll(c : Collection<Any?>) : Boolean
-    override fun retainAll(c : Collection<Any?>) : Boolean
-    override fun clear() : Unit
+    override fun addAll(c: Collection<E>): Boolean
+    override fun removeAll(c: Collection<Any?>): Boolean
+    override fun retainAll(c: Collection<Any?>): Boolean
+    override fun clear(): Unit
 }
 
 public trait Map<K, out V> {
     // Query Operations
-    public fun size() : Int
-    public fun isEmpty() : Boolean
-    public fun containsKey(key : Any?) : Boolean
-    public fun containsValue(value : Any?) : Boolean
-    public fun get(key : Any?) : V?
+    public fun size(): Int
+    public fun isEmpty(): Boolean
+    public fun containsKey(key: Any?): Boolean
+    public fun containsValue(value: Any?): Boolean
+    public fun get(key: Any?): V?
 
     // Views
-    public fun keySet() : Set<K>
-    public fun values() : Collection<V>
-    public fun entrySet() : Set<Map.Entry<K, V>>
+    public fun keySet(): Set<K>
+    public fun values(): Collection<V>
+    public fun entrySet(): Set<Map.Entry<K, V>>
 
     public trait Entry<out K, out V> {
-        public fun getKey() : K
-        public fun getValue() : V
+        public fun getKey(): K
+        public fun getValue(): V
     }
 }
 
 public trait MutableMap<K, V> : Map<K, V> {
     // Modification Operations
-    public fun put(key : K, value : V) : V?
-    public fun remove(key : Any?) : V?
+    public fun put(key: K, value: V): V?
+    public fun remove(key: Any?): V?
 
     // Bulk Modification Operations
-    public fun putAll(m : Map<out K, V>) : Unit
-    public fun clear() : Unit
+    public fun putAll(m: Map<out K, V>): Unit
+    public fun clear(): Unit
 
     // Views
-    override fun keySet() : MutableSet<K>
-    override fun values() : MutableCollection<V>
-    override fun entrySet() : MutableSet<MutableMap.MutableEntry<K, V>>
+    override fun keySet(): MutableSet<K>
+    override fun values(): MutableCollection<V>
+    override fun entrySet(): MutableSet<MutableMap.MutableEntry<K, V>>
 
-    public trait MutableEntry<K,V> : Map.Entry<K, V> {
-    	public fun setValue(value : V) : V
+    public trait MutableEntry<K,V>: Map.Entry<K, V> {
+    	public fun setValue(value: V): V
     }
 }
diff --git a/core/builtins/native/kotlin/Numbers.kt b/core/builtins/native/kotlin/Numbers.kt
index 2903286677e..28384c15fe2 100644
--- a/core/builtins/native/kotlin/Numbers.kt
+++ b/core/builtins/native/kotlin/Numbers.kt
@@ -17,452 +17,452 @@
 package kotlin
 
 public abstract class Number {
-  public abstract fun toDouble() : Double
-  public abstract fun toFloat() : Float
-  public abstract fun toLong() : Long
-  public abstract fun toInt() : Int
-  public abstract fun toChar() : Char
-  public abstract fun toShort() : Short
-  public abstract fun toByte() : Byte
+    public abstract fun toDouble(): Double
+    public abstract fun toFloat(): Float
+    public abstract fun toLong(): Long
+    public abstract fun toInt(): Int
+    public abstract fun toChar(): Char
+    public abstract fun toShort(): Short
+    public abstract fun toByte(): Byte
 }
 
-public class Double private () : Number, Comparable<Double>  {
-  public override fun compareTo(other : Double)  : Int
-  public fun compareTo(other : Float)  : Int
-  public fun compareTo(other : Long)   : Int
-  public fun compareTo(other : Int)    : Int
-  public fun compareTo(other : Short)  : Int
-  public fun compareTo(other : Byte)   : Int
-  public fun compareTo(other : Char)   : Int
+public class Double private () : Number, Comparable<Double> {
+    public override fun compareTo(other: Double): Int
+    public fun compareTo(other: Float): Int
+    public fun compareTo(other: Long) : Int
+    public fun compareTo(other: Int)  : Int
+    public fun compareTo(other: Short): Int
+    public fun compareTo(other: Byte) : Int
+    public fun compareTo(other: Char) : Int
 
-  public fun plus(other : Double) : Double
-  public fun plus(other : Float)  : Double
-  public fun plus(other : Long)   : Double
-  public fun plus(other : Int)    : Double
-  public fun plus(other : Short)  : Double
-  public fun plus(other : Byte)   : Double
-  public fun plus(other : Char)   : Double
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Double
+    public fun plus(other: Long)  : Double
+    public fun plus(other: Int)   : Double
+    public fun plus(other: Short) : Double
+    public fun plus(other: Byte)  : Double
+    public fun plus(other: Char)  : Double
 
-  public fun minus(other : Double) : Double
-  public fun minus(other : Float)  : Double
-  public fun minus(other : Long)   : Double
-  public fun minus(other : Int)    : Double
-  public fun minus(other : Short)  : Double
-  public fun minus(other : Byte)   : Double
-  public fun minus(other : Char)   : Double
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Double
+    public fun minus(other: Long)  : Double
+    public fun minus(other: Int)   : Double
+    public fun minus(other: Short) : Double
+    public fun minus(other: Byte)  : Double
+    public fun minus(other: Char)  : Double
 
-  public fun times(other : Double) : Double
-  public fun times(other : Float)  : Double
-  public fun times(other : Long)   : Double
-  public fun times(other : Int)    : Double
-  public fun times(other : Short)  : Double
-  public fun times(other : Byte)   : Double
-  public fun times(other : Char)   : Double
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Double
+    public fun times(other: Long)  : Double
+    public fun times(other: Int)   : Double
+    public fun times(other: Short) : Double
+    public fun times(other: Byte)  : Double
+    public fun times(other: Char)  : Double
 
-  public fun div(other : Double) : Double
-  public fun div(other : Float)  : Double
-  public fun div(other : Long)   : Double
-  public fun div(other : Int)    : Double
-  public fun div(other : Short)  : Double
-  public fun div(other : Byte)   : Double
-  public fun div(other : Char)   : Double
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Double
+    public fun div(other: Long)  : Double
+    public fun div(other: Int)   : Double
+    public fun div(other: Short) : Double
+    public fun div(other: Byte)  : Double
+    public fun div(other: Char)  : Double
 
-  public fun mod(other : Double) : Double
-  public fun mod(other : Float)  : Double
-  public fun mod(other : Long)   : Double
-  public fun mod(other : Int)    : Double
-  public fun mod(other : Short)  : Double
-  public fun mod(other : Byte)   : Double
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Double
+    public fun mod(other: Long)  : Double
+    public fun mod(other: Int)   : Double
+    public fun mod(other: Short) : Double
+    public fun mod(other: Byte)  : Double
 
-  public fun rangeTo(other : Double) : DoubleRange
-  public fun rangeTo(other : Float)  : DoubleRange
-  public fun rangeTo(other : Long)   : DoubleRange
-  public fun rangeTo(other : Int)    : DoubleRange
-  public fun rangeTo(other : Short)  : DoubleRange
-  public fun rangeTo(other : Byte)   : DoubleRange
-  public fun rangeTo(other : Char)   : DoubleRange
+    public fun rangeTo(other: Double): DoubleRange
+    public fun rangeTo(other: Float) : DoubleRange
+    public fun rangeTo(other: Long)  : DoubleRange
+    public fun rangeTo(other: Int)   : DoubleRange
+    public fun rangeTo(other: Short) : DoubleRange
+    public fun rangeTo(other: Byte)  : DoubleRange
+    public fun rangeTo(other: Char)  : DoubleRange
 
-  public fun inc() : Double
-  public fun dec() : Double
-  public fun plus() : Double
-  public fun minus() : Double
+    public fun inc(): Double
+    public fun dec(): Double
+    public fun plus(): Double
+    public fun minus(): Double
 
-  public override fun toDouble() : Double
-  public override fun toFloat() : Float
-  public override fun toLong() : Long
-  public override fun toInt() : Int
-  public override fun toChar() : Char
-  public override fun toShort() : Short
-  public override fun toByte() : Byte
+    public override fun toDouble(): Double
+    public override fun toFloat(): Float
+    public override fun toLong(): Long
+    public override fun toInt(): Int
+    public override fun toChar(): Char
+    public override fun toShort(): Short
+    public override fun toByte(): Byte
 }
 
-public class Float private () : Number, Comparable<Float>  {
-  public fun compareTo(other : Double) : Int
-  public override fun compareTo(other : Float) : Int
-  public fun compareTo(other : Long)   : Int
-  public fun compareTo(other : Int)    : Int
-  public fun compareTo(other : Short)  : Int
-  public fun compareTo(other : Byte)   : Int
-  public fun compareTo(other : Char)   : Int
+public class Float private () : Number, Comparable<Float> {
+    public fun compareTo(other: Double): Int
+    public override fun compareTo(other: Float): Int
+    public fun compareTo(other: Long)  : Int
+    public fun compareTo(other: Int)   : Int
+    public fun compareTo(other: Short) : Int
+    public fun compareTo(other: Byte)  : Int
+    public fun compareTo(other: Char)  : Int
 
-  public fun plus(other : Double) : Double
-  public fun plus(other : Float)  : Float
-  public fun plus(other : Long)   : Float
-  public fun plus(other : Int)    : Float
-  public fun plus(other : Short)  : Float
-  public fun plus(other : Byte)   : Float
-  public fun plus(other : Char)   : Float
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Float
+    public fun plus(other: Long)  : Float
+    public fun plus(other: Int)   : Float
+    public fun plus(other: Short) : Float
+    public fun plus(other: Byte)  : Float
+    public fun plus(other: Char)  : Float
 
-  public fun minus(other : Double) : Double
-  public fun minus(other : Float)  : Float
-  public fun minus(other : Long)   : Float
-  public fun minus(other : Int)    : Float
-  public fun minus(other : Short)  : Float
-  public fun minus(other : Byte)   : Float
-  public fun minus(other : Char)   : Float
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Float
+    public fun minus(other: Long)  : Float
+    public fun minus(other: Int)   : Float
+    public fun minus(other: Short) : Float
+    public fun minus(other: Byte)  : Float
+    public fun minus(other: Char)  : Float
 
-  public fun times(other : Double) : Double
-  public fun times(other : Float)  : Float
-  public fun times(other : Long)   : Float
-  public fun times(other : Int)    : Float
-  public fun times(other : Short)  : Float
-  public fun times(other : Byte)   : Float
-  public fun times(other : Char)   : Float
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Float
+    public fun times(other: Long)  : Float
+    public fun times(other: Int)   : Float
+    public fun times(other: Short) : Float
+    public fun times(other: Byte)  : Float
+    public fun times(other: Char)  : Float
 
-  public fun div(other : Double) : Double
-  public fun div(other : Float)  : Float
-  public fun div(other : Long)   : Float
-  public fun div(other : Int)    : Float
-  public fun div(other : Short)  : Float
-  public fun div(other : Byte)   : Float
-  public fun div(other : Char)   : Float
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Float
+    public fun div(other: Long)  : Float
+    public fun div(other: Int)   : Float
+    public fun div(other: Short) : Float
+    public fun div(other: Byte)  : Float
+    public fun div(other: Char)  : Float
 
-  public fun mod(other : Double) : Double
-  public fun mod(other : Float)  : Float
-  public fun mod(other : Long)   : Float
-  public fun mod(other : Int)    : Float
-  public fun mod(other : Short)  : Float
-  public fun mod(other : Byte)   : Float
-  public fun mod(other : Char)   : Float
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Float
+    public fun mod(other: Long)  : Float
+    public fun mod(other: Int)   : Float
+    public fun mod(other: Short) : Float
+    public fun mod(other: Byte)  : Float
+    public fun mod(other: Char)  : Float
 
-  public fun rangeTo(other : Double) : DoubleRange
-  public fun rangeTo(other : Float)  : FloatRange
-  public fun rangeTo(other : Long)   : FloatRange
-  public fun rangeTo(other : Int)    : FloatRange
-  public fun rangeTo(other : Short)  : FloatRange
-  public fun rangeTo(other : Byte)   : FloatRange
-  public fun rangeTo(other : Char)   : FloatRange
+    public fun rangeTo(other: Double): DoubleRange
+    public fun rangeTo(other: Float) : FloatRange
+    public fun rangeTo(other: Long)  : FloatRange
+    public fun rangeTo(other: Int)   : FloatRange
+    public fun rangeTo(other: Short) : FloatRange
+    public fun rangeTo(other: Byte)  : FloatRange
+    public fun rangeTo(other: Char)  : FloatRange
 
-  public fun inc() : Float
-  public fun dec() : Float
-  public fun plus() : Float
-  public fun minus() : Float
+    public fun inc(): Float
+    public fun dec(): Float
+    public fun plus(): Float
+    public fun minus(): Float
 
-  public override fun toDouble() : Double
-  public override fun toFloat() : Float
-  public override fun toLong() : Long
-  public override fun toInt() : Int
-  public override fun toChar() : Char
-  public override fun toShort() : Short
-  public override fun toByte() : Byte
+    public override fun toDouble(): Double
+    public override fun toFloat(): Float
+    public override fun toLong(): Long
+    public override fun toInt(): Int
+    public override fun toChar(): Char
+    public override fun toShort(): Short
+    public override fun toByte(): Byte
 }
 
 public class Long private () : Number, Comparable<Long> {
-  public fun compareTo(other : Double) : Int
-  public fun compareTo(other : Float)  : Int
-  public override fun compareTo(other : Long)   : Int
-  public fun compareTo(other : Int)    : Int
-  public fun compareTo(other : Short)  : Int
-  public fun compareTo(other : Byte)   : Int
-  public fun compareTo(other : Char)   : Int
+    public fun compareTo(other: Double): Int
+    public fun compareTo(other: Float) : Int
+    public override fun compareTo(other: Long): Int
+    public fun compareTo(other: Int)   : Int
+    public fun compareTo(other: Short) : Int
+    public fun compareTo(other: Byte)  : Int
+    public fun compareTo(other: Char)  : Int
 
-  public fun plus(other : Double) : Double
-  public fun plus(other : Float)  : Float
-  public fun plus(other : Long)   : Long
-  public fun plus(other : Int)    : Long
-  public fun plus(other : Short)  : Long
-  public fun plus(other : Byte)   : Long
-  public fun plus(other : Char)   : Long
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Float
+    public fun plus(other: Long)  : Long
+    public fun plus(other: Int)   : Long
+    public fun plus(other: Short) : Long
+    public fun plus(other: Byte)  : Long
+    public fun plus(other: Char)  : Long
 
-  public fun minus(other : Double) : Double
-  public fun minus(other : Float)  : Float
-  public fun minus(other : Long)   : Long
-  public fun minus(other : Int)    : Long
-  public fun minus(other : Short)  : Long
-  public fun minus(other : Byte)   : Long
-  public fun minus(other : Char)   : Long
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Float
+    public fun minus(other: Long)  : Long
+    public fun minus(other: Int)   : Long
+    public fun minus(other: Short) : Long
+    public fun minus(other: Byte)  : Long
+    public fun minus(other: Char)  : Long
 
-  public fun times(other : Double) : Double
-  public fun times(other : Float)  : Float
-  public fun times(other : Long)   : Long
-  public fun times(other : Int)    : Long
-  public fun times(other : Short)  : Long
-  public fun times(other : Byte)   : Long
-  public fun times(other : Char)   : Long
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Float
+    public fun times(other: Long)  : Long
+    public fun times(other: Int)   : Long
+    public fun times(other: Short) : Long
+    public fun times(other: Byte)  : Long
+    public fun times(other: Char)  : Long
 
-  public fun div(other : Double) : Double
-  public fun div(other : Float)  : Float
-  public fun div(other : Long)   : Long
-  public fun div(other : Int)    : Long
-  public fun div(other : Short)  : Long
-  public fun div(other : Byte)   : Long
-  public fun div(other : Char)   : Long
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Float
+    public fun div(other: Long)  : Long
+    public fun div(other: Int)   : Long
+    public fun div(other: Short) : Long
+    public fun div(other: Byte)  : Long
+    public fun div(other: Char)  : Long
 
-  public fun mod(other : Double) : Double
-  public fun mod(other : Float)  : Float
-  public fun mod(other : Long)   : Long
-  public fun mod(other : Int)    : Long
-  public fun mod(other : Short)  : Long
-  public fun mod(other : Byte)   : Long
-  public fun mod(other : Char)   : Long
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Float
+    public fun mod(other: Long)  : Long
+    public fun mod(other: Int)   : Long
+    public fun mod(other: Short) : Long
+    public fun mod(other: Byte)  : Long
+    public fun mod(other: Char)  : Long
 
-  public fun rangeTo(other : Double) : DoubleRange
-  public fun rangeTo(other : Float)  : FloatRange
-  public fun rangeTo(other : Long)   : LongRange
-  public fun rangeTo(other : Int)    : LongRange
-  public fun rangeTo(other : Short)  : LongRange
-  public fun rangeTo(other : Byte)   : LongRange
-  public fun rangeTo(other : Char)   : LongRange
+    public fun rangeTo(other: Double): DoubleRange
+    public fun rangeTo(other: Float) : FloatRange
+    public fun rangeTo(other: Long)  : LongRange
+    public fun rangeTo(other: Int)   : LongRange
+    public fun rangeTo(other: Short) : LongRange
+    public fun rangeTo(other: Byte)  : LongRange
+    public fun rangeTo(other: Char)  : LongRange
 
-  public fun inc() : Long
-  public fun dec() : Long
-  public fun plus() : Long
-  public fun minus() : Long
+    public fun inc(): Long
+    public fun dec(): Long
+    public fun plus(): Long
+    public fun minus(): Long
 
-  public fun shl(bits : Int) : Long
-  public fun shr(bits : Int) : Long
-  public fun ushr(bits : Int) : Long
-  public fun and(other : Long) : Long
-  public fun or(other : Long) : Long
-  public fun xor(other : Long) : Long
-  public fun inv() : Long
+    public fun shl(bits: Int): Long
+    public fun shr(bits: Int): Long
+    public fun ushr(bits: Int): Long
+    public fun and(other: Long): Long
+    public fun or(other: Long): Long
+    public fun xor(other: Long): Long
+    public fun inv(): Long
 
-  public override fun toDouble() : Double
-  public override fun toFloat() : Float
-  public override fun toLong() : Long
-  public override fun toInt() : Int
-  public override fun toChar() : Char
-  public override fun toShort() : Short
-  public override fun toByte() : Byte
+    public override fun toDouble(): Double
+    public override fun toFloat(): Float
+    public override fun toLong(): Long
+    public override fun toInt(): Int
+    public override fun toChar(): Char
+    public override fun toShort(): Short
+    public override fun toByte(): Byte
 }
 
 public class Int private () : Number, Comparable<Int> {
-  public fun compareTo(other : Double) : Int
-  public fun compareTo(other : Float)  : Int
-  public fun compareTo(other : Long)   : Int
-  public override fun compareTo(other : Int)    : Int
-  public fun compareTo(other : Short)  : Int
-  public fun compareTo(other : Byte)   : Int
-  public fun compareTo(other : Char)   : Int
+    public fun compareTo(other: Double): Int
+    public fun compareTo(other: Float) : Int
+    public fun compareTo(other: Long)  : Int
+    public override fun compareTo(other: Int): Int
+    public fun compareTo(other: Short) : Int
+    public fun compareTo(other: Byte)  : Int
+    public fun compareTo(other: Char)  : Int
 
-  public fun plus(other : Double) : Double
-  public fun plus(other : Float)  : Float
-  public fun plus(other : Long)   : Long
-  public fun plus(other : Int)    : Int
-  public fun plus(other : Short)  : Int
-  public fun plus(other : Byte)   : Int
-  public fun plus(other : Char)   : Int
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Float
+    public fun plus(other: Long)  : Long
+    public fun plus(other: Int)   : Int
+    public fun plus(other: Short) : Int
+    public fun plus(other: Byte)  : Int
+    public fun plus(other: Char)  : Int
 
-  public fun minus(other : Double) : Double
-  public fun minus(other : Float)  : Float
-  public fun minus(other : Long)   : Long
-  public fun minus(other : Int)    : Int
-  public fun minus(other : Short)  : Int
-  public fun minus(other : Byte)   : Int
-  public fun minus(other : Char)   : Int
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Float
+    public fun minus(other: Long)  : Long
+    public fun minus(other: Int)   : Int
+    public fun minus(other: Short) : Int
+    public fun minus(other: Byte)  : Int
+    public fun minus(other: Char)  : Int
 
-  public fun times(other : Double) : Double
-  public fun times(other : Float)  : Float
-  public fun times(other : Long)   : Long
-  public fun times(other : Int)    : Int
-  public fun times(other : Short)  : Int
-  public fun times(other : Byte)   : Int
-  public fun times(other : Char)   : Int
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Float
+    public fun times(other: Long)  : Long
+    public fun times(other: Int)   : Int
+    public fun times(other: Short) : Int
+    public fun times(other: Byte)  : Int
+    public fun times(other: Char)  : Int
 
-  public fun div(other : Double) : Double
-  public fun div(other : Float)  : Float
-  public fun div(other : Long)   : Long
-  public fun div(other : Int)    : Int
-  public fun div(other : Short)  : Int
-  public fun div(other : Byte)   : Int
-  public fun div(other : Char)   : Int
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Float
+    public fun div(other: Long)  : Long
+    public fun div(other: Int)   : Int
+    public fun div(other: Short) : Int
+    public fun div(other: Byte)  : Int
+    public fun div(other: Char)  : Int
 
-  public fun mod(other : Double) : Double
-  public fun mod(other : Float)  : Float
-  public fun mod(other : Long)   : Long
-  public fun mod(other : Int)    : Int
-  public fun mod(other : Short)  : Int
-  public fun mod(other : Byte)   : Int
-  public fun mod(other : Char)   : Int
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Float
+    public fun mod(other: Long)  : Long
+    public fun mod(other: Int)   : Int
+    public fun mod(other: Short) : Int
+    public fun mod(other: Byte)  : Int
+    public fun mod(other: Char)  : Int
 
-  public fun rangeTo(other : Double) : DoubleRange
-  public fun rangeTo(other : Float)  : FloatRange
-  public fun rangeTo(other : Long)   : LongRange
-  public fun rangeTo(other : Int)    : IntRange
-  public fun rangeTo(other : Short)  : IntRange
-  public fun rangeTo(other : Byte)   : IntRange
-  public fun rangeTo(other : Char)   : IntRange
+    public fun rangeTo(other: Double): DoubleRange
+    public fun rangeTo(other: Float) : FloatRange
+    public fun rangeTo(other: Long)  : LongRange
+    public fun rangeTo(other: Int)   : IntRange
+    public fun rangeTo(other: Short) : IntRange
+    public fun rangeTo(other: Byte)  : IntRange
+    public fun rangeTo(other: Char)  : IntRange
 
-  public fun inc() : Int
-  public fun dec() : Int
-  public fun plus() : Int
-  public fun minus() : Int
+    public fun inc(): Int
+    public fun dec(): Int
+    public fun plus(): Int
+    public fun minus(): Int
 
-  public fun shl(bits : Int) : Int
-  public fun shr(bits : Int) : Int
-  public fun ushr(bits : Int) : Int
-  public fun and(other : Int) : Int
-  public fun or(other : Int) : Int
-  public fun xor(other : Int) : Int
-  public fun inv() : Int
+    public fun shl(bits: Int): Int
+    public fun shr(bits: Int): Int
+    public fun ushr(bits: Int): Int
+    public fun and(other: Int): Int
+    public fun or(other: Int): Int
+    public fun xor(other: Int): Int
+    public fun inv(): Int
 
-  public override fun toDouble() : Double
-  public override fun toFloat() : Float
-  public override fun toLong() : Long
-  public override fun toInt() : Int
-  public override fun toChar() : Char
-  public override fun toShort() : Short
-  public override fun toByte() : Byte
+    public override fun toDouble(): Double
+    public override fun toFloat(): Float
+    public override fun toLong(): Long
+    public override fun toInt(): Int
+    public override fun toChar(): Char
+    public override fun toShort(): Short
+    public override fun toByte(): Byte
 }
 
 public class Short private () : Number, Comparable<Short> {
-  public fun compareTo(other : Double) : Int
-  public fun compareTo(other : Float)  : Int
-  public fun compareTo(other : Long)    : Int
-  public fun compareTo(other : Int)    : Int
-  public override fun compareTo(other : Short)    : Int
-  public fun compareTo(other : Byte)   : Int
-  public fun compareTo(other : Char)   : Int
+    public fun compareTo(other: Double): Int
+    public fun compareTo(other: Float) : Int
+    public fun compareTo(other: Long)  : Int
+    public fun compareTo(other: Int)   : Int
+    public override fun compareTo(other: Short): Int
+    public fun compareTo(other: Byte)  : Int
+    public fun compareTo(other: Char)  : Int
 
-  public fun plus(other : Double) : Double
-  public fun plus(other : Float)  : Float
-  public fun plus(other : Long)   : Long
-  public fun plus(other : Int)    : Int
-  public fun plus(other : Short)  : Int
-  public fun plus(other : Byte)   : Int
-  public fun plus(other : Char)   : Int
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Float
+    public fun plus(other: Long)  : Long
+    public fun plus(other: Int)   : Int
+    public fun plus(other: Short) : Int
+    public fun plus(other: Byte)  : Int
+    public fun plus(other: Char)  : Int
 
-  public fun minus(other : Double) : Double
-  public fun minus(other : Float)  : Float
-  public fun minus(other : Long)   : Long
-  public fun minus(other : Int)    : Int
-  public fun minus(other : Short)  : Int
-  public fun minus(other : Byte)   : Int
-  public fun minus(other : Char)   : Int
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Float
+    public fun minus(other: Long)  : Long
+    public fun minus(other: Int)   : Int
+    public fun minus(other: Short) : Int
+    public fun minus(other: Byte)  : Int
+    public fun minus(other: Char)  : Int
 
-  public fun times(other : Double) : Double
-  public fun times(other : Float)  : Float
-  public fun times(other : Long)   : Long
-  public fun times(other : Int)    : Int
-  public fun times(other : Short)  : Int
-  public fun times(other : Byte)   : Int
-  public fun times(other : Char)   : Int
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Float
+    public fun times(other: Long)  : Long
+    public fun times(other: Int)   : Int
+    public fun times(other: Short) : Int
+    public fun times(other: Byte)  : Int
+    public fun times(other: Char)  : Int
 
-  public fun div(other : Double) : Double
-  public fun div(other : Float)  : Float
-  public fun div(other : Long)   : Long
-  public fun div(other : Int)    : Int
-  public fun div(other : Short)  : Int
-  public fun div(other : Byte)   : Int
-  public fun div(other : Char)   : Int
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Float
+    public fun div(other: Long)  : Long
+    public fun div(other: Int)   : Int
+    public fun div(other: Short) : Int
+    public fun div(other: Byte)  : Int
+    public fun div(other: Char)  : Int
 
-  public fun mod(other : Double) : Double
-  public fun mod(other : Float)  : Float
-  public fun mod(other : Long)   : Long
-  public fun mod(other : Int)    : Int
-  public fun mod(other : Short)  : Int
-  public fun mod(other : Byte)   : Int
-  public fun mod(other : Char)   : Int
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Float
+    public fun mod(other: Long)  : Long
+    public fun mod(other: Int)   : Int
+    public fun mod(other: Short) : Int
+    public fun mod(other: Byte)  : Int
+    public fun mod(other: Char)  : Int
 
-  public fun rangeTo(other : Double) : DoubleRange
-  public fun rangeTo(other : Float)  : FloatRange
-  public fun rangeTo(other : Long)   : LongRange
-  public fun rangeTo(other : Int)    : IntRange
-  public fun rangeTo(other : Short)  : ShortRange
-  public fun rangeTo(other : Byte)   : ShortRange
-  public fun rangeTo(other : Char)   : ShortRange
+    public fun rangeTo(other: Double): DoubleRange
+    public fun rangeTo(other: Float) : FloatRange
+    public fun rangeTo(other: Long)  : LongRange
+    public fun rangeTo(other: Int)   : IntRange
+    public fun rangeTo(other: Short) : ShortRange
+    public fun rangeTo(other: Byte)  : ShortRange
+    public fun rangeTo(other: Char)  : ShortRange
 
-  public fun inc() : Short
-  public fun dec() : Short
-  public fun plus() : Int
-  public fun minus() : Int
+    public fun inc(): Short
+    public fun dec(): Short
+    public fun plus(): Int
+    public fun minus(): Int
 
-  public override fun toDouble() : Double
-  public override fun toFloat() : Float
-  public override fun toLong() : Long
-  public override fun toInt() : Int
-  public override fun toChar() : Char
-  public override fun toShort() : Short
-  public override fun toByte() : Byte
+    public override fun toDouble(): Double
+    public override fun toFloat(): Float
+    public override fun toLong(): Long
+    public override fun toInt(): Int
+    public override fun toChar(): Char
+    public override fun toShort(): Short
+    public override fun toByte(): Byte
 }
 
 public class Byte private () : Number, Comparable<Byte> {
-  public fun compareTo(other : Double) : Int
-  public fun compareTo(other : Float)  : Int
-  public fun compareTo(other : Long)    : Int
-  public fun compareTo(other : Int)    : Int
-  public fun compareTo(other : Short)  : Int
-  public fun compareTo(other : Char)   : Int
-  public override fun compareTo(other : Byte)   : Int
+    public fun compareTo(other: Double): Int
+    public fun compareTo(other: Float) : Int
+    public fun compareTo(other: Long)  : Int
+    public fun compareTo(other: Int)   : Int
+    public fun compareTo(other: Short) : Int
+    public fun compareTo(other: Char)  : Int
+    public override fun compareTo(other: Byte): Int
 
-  public fun plus(other : Double) : Double
-  public fun plus(other : Float)  : Float
-  public fun plus(other : Long)   : Long
-  public fun plus(other : Int)    : Int
-  public fun plus(other : Short)  : Int
-  public fun plus(other : Byte)   : Int
-  public fun plus(other : Char)   : Int
+    public fun plus(other: Double): Double
+    public fun plus(other: Float) : Float
+    public fun plus(other: Long)  : Long
+    public fun plus(other: Int)   : Int
+    public fun plus(other: Short) : Int
+    public fun plus(other: Byte)  : Int
+    public fun plus(other: Char)  : Int
 
-  public fun minus(other : Double) : Double
-  public fun minus(other : Float)  : Float
-  public fun minus(other : Long)   : Long
-  public fun minus(other : Int)    : Int
-  public fun minus(other : Short)  : Int
-  public fun minus(other : Byte)   : Int
-  public fun minus(other : Char)   : Int
+    public fun minus(other: Double): Double
+    public fun minus(other: Float) : Float
+    public fun minus(other: Long)  : Long
+    public fun minus(other: Int)   : Int
+    public fun minus(other: Short) : Int
+    public fun minus(other: Byte)  : Int
+    public fun minus(other: Char)  : Int
 
-  public fun times(other : Double) : Double
-  public fun times(other : Float)  : Float
-  public fun times(other : Long)   : Long
-  public fun times(other : Int)    : Int
-  public fun times(other : Short)  : Int
-  public fun times(other : Byte)   : Int
-  public fun times(other : Char)   : Int
+    public fun times(other: Double): Double
+    public fun times(other: Float) : Float
+    public fun times(other: Long)  : Long
+    public fun times(other: Int)   : Int
+    public fun times(other: Short) : Int
+    public fun times(other: Byte)  : Int
+    public fun times(other: Char)  : Int
 
-  public fun div(other : Double) : Double
-  public fun div(other : Float)  : Float
-  public fun div(other : Long)   : Long
-  public fun div(other : Int)    : Int
-  public fun div(other : Short)  : Int
-  public fun div(other : Byte)   : Int
-  public fun div(other : Char)   : Int
+    public fun div(other: Double): Double
+    public fun div(other: Float) : Float
+    public fun div(other: Long)  : Long
+    public fun div(other: Int)   : Int
+    public fun div(other: Short) : Int
+    public fun div(other: Byte)  : Int
+    public fun div(other: Char)  : Int
 
-  public fun mod(other : Double) : Double
-  public fun mod(other : Float)  : Float
-  public fun mod(other : Long)   : Long
-  public fun mod(other : Int)    : Int
-  public fun mod(other : Short)  : Int
-  public fun mod(other : Byte)   : Int
-  public fun mod(other : Char)   : Int
+    public fun mod(other: Double): Double
+    public fun mod(other: Float) : Float
+    public fun mod(other: Long)  : Long
+    public fun mod(other: Int)   : Int
+    public fun mod(other: Short) : Int
+    public fun mod(other: Byte)  : Int
+    public fun mod(other: Char)  : Int
 
-  public fun rangeTo(other : Double) : DoubleRange
-  public fun rangeTo(other : Float)  : FloatRange
-  public fun rangeTo(other : Long)   : LongRange
-  public fun rangeTo(other : Int)    : IntRange
-  public fun rangeTo(other : Short)  : ShortRange
-  public fun rangeTo(other : Byte)   : ByteRange
-  public fun rangeTo(other : Char)   : CharRange
+    public fun rangeTo(other: Double): DoubleRange
+    public fun rangeTo(other: Float) : FloatRange
+    public fun rangeTo(other: Long)  : LongRange
+    public fun rangeTo(other: Int)   : IntRange
+    public fun rangeTo(other: Short) : ShortRange
+    public fun rangeTo(other: Byte)  : ByteRange
+    public fun rangeTo(other: Char)  : CharRange
 
-  public fun inc() : Byte
-  public fun dec() : Byte
-  public fun plus() : Int
-  public fun minus() : Int
+    public fun inc(): Byte
+    public fun dec(): Byte
+    public fun plus(): Int
+    public fun minus(): Int
 
-  public override fun toDouble() : Double
-  public override fun toFloat() : Float
-  public override fun toLong() : Long
-  public override fun toInt() : Int
-  public override fun toChar() : Char
-  public override fun toShort() : Short
-  public override fun toByte() : Byte
+    public override fun toDouble(): Double
+    public override fun toFloat(): Float
+    public override fun toLong(): Long
+    public override fun toInt(): Int
+    public override fun toChar(): Char
+    public override fun toShort(): Short
+    public override fun toByte(): Byte
 }
diff --git a/idea/testData/resolve/referenceInLib/builtInNumber.kt b/idea/testData/resolve/referenceInLib/builtInNumber.kt
index 4df339956cf..be77cca86d1 100644
--- a/idea/testData/resolve/referenceInLib/builtInNumber.kt
+++ b/idea/testData/resolve/referenceInLib/builtInNumber.kt
@@ -1,6 +1,6 @@
 val a: <caret>Number? = null
 
-// CONTEXT: public abstract fun toDouble() : <ref-caret>Double
+// CONTEXT: public abstract fun toDouble(): <ref-caret>Double
 // RUNTIME
 
 // REF: (kotlin).Double