diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1007.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1050.xml
similarity index 65%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1007.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1050.xml
index 3a781f73..c45b4b40 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1007.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_rc_1050.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1007/kotlin-compiler-1.0.0-rc-1007.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1050/kotlin-compiler-1.0.0-rc-1050.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1007/kotlin-compiler-1.0.0-rc-1007-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1050/kotlin-compiler-1.0.0-rc-1050-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1007/kotlin-compiler-1.0.0-rc-1007-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-rc-1050/kotlin-compiler-1.0.0-rc-1050-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1007.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1050.xml
similarity index 58%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1007.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1050.xml
index aa9973a6..65fc7e1f 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1007.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_rc_1050.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1007/kotlin-maven-plugin-1.0.0-rc-1007.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1050/kotlin-maven-plugin-1.0.0-rc-1050.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1007/kotlin-maven-plugin-1.0.0-rc-1007-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1050/kotlin-maven-plugin-1.0.0-rc-1050-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1007/kotlin-maven-plugin-1.0.0-rc-1007-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-rc-1050/kotlin-maven-plugin-1.0.0-rc-1050-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1007.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1050.xml
similarity index 65%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1007.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1050.xml
index 280c7dc8..da7d1b25 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1007.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1050.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1007/kotlin-runtime-1.0.0-rc-1007.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1050/kotlin-runtime-1.0.0-rc-1050.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1007/kotlin-runtime-1.0.0-rc-1007-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1050/kotlin-runtime-1.0.0-rc-1050-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1007/kotlin-runtime-1.0.0-rc-1007-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1050/kotlin-runtime-1.0.0-rc-1050-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1007.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1050.xml
similarity index 65%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1007.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1050.xml
index edbabf94..524f9cb6 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1007.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_rc_1050.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1007/kotlin-stdlib-1.0.0-rc-1007.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1050/kotlin-stdlib-1.0.0-rc-1050.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1007/kotlin-stdlib-1.0.0-rc-1007-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1050/kotlin-stdlib-1.0.0-rc-1050-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1007/kotlin-stdlib-1.0.0-rc-1007-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1050/kotlin-stdlib-1.0.0-rc-1050-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/API/API.iml b/reactor/API/API.iml
index d7f4388b..1e636929 100644
--- a/reactor/API/API.iml
+++ b/reactor/API/API.iml
@@ -9,9 +9,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@@ -36,7 +36,7 @@
     <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml
index 68d213ee..fc249275 100644
--- a/reactor/Core/Core.iml
+++ b/reactor/Core/Core.iml
@@ -20,9 +20,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="code-1.0" level="project" />
     <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@@ -47,7 +47,7 @@
     <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml
index d7f4388b..1e636929 100644
--- a/reactor/Reactor.iml
+++ b/reactor/Reactor.iml
@@ -9,9 +9,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@@ -36,7 +36,7 @@
     <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml
index be7f5e2a..4414fa37 100644
--- a/reactor/Test/Test.iml
+++ b/reactor/Test/Test.iml
@@ -23,9 +23,9 @@
     <orderEntry type="module" module-name="Core" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1007" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@@ -50,7 +50,7 @@
     <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1007" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
diff --git a/reactor/Test/src/program/MemProgram.kt b/reactor/Test/src/program/MemProgram.kt
index 2e7ae839..a622535c 100644
--- a/reactor/Test/src/program/MemProgram.kt
+++ b/reactor/Test/src/program/MemProgram.kt
@@ -141,12 +141,10 @@ class ConstraintRegistry(val sessionSolver: SessionSolver) {
             unmodifiableSet(myConstraintArgTypes.keys)
 
     fun constraintArgTypes(symbol: ConstraintSymbol): List<Class<*>> =
-            unmodifiableList(myConstraintArgTypes.getOrImplicitDefault(symbol))
+            unmodifiableList(myConstraintArgTypes.getOrPut(symbol, { emptyList() }))
 
     fun predicateSymbols(): Iterable<PredicateSymbol> =
             unmodifiableSet(myPredicateSolvers.keys)
 
-    fun solverClass(symbol: PredicateSymbol): Class<out Queryable> =
-            myPredicateSolvers.getOrImplicitDefault(symbol)
 }
 
diff --git a/reactor/pom.xml b/reactor/pom.xml
index 6150f3e4..08da13de 100644
--- a/reactor/pom.xml
+++ b/reactor/pom.xml
@@ -8,7 +8,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin.version>1.0.0-rc-1007</kotlin.version>
+        <kotlin.version>1.0.0-rc-1050</kotlin.version>
     </properties>
 
     <groupId>jetbrains.mps.logic.memreactor</groupId>