Clean up properties collection

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt

@@ -19,9 +19,7 @@ data class JvmDependency(val classpath: List<File>) : ScriptDependency {
 interface JvmScriptCompilationConfigurationKeys
 
 open class JvmScriptCompilationConfigurationBuilder : PropertiesCollection.Builder(), JvmScriptCompilationConfigurationKeys {
-    companion object : PropertiesCollection.Builder.BuilderExtension<JvmScriptCompilationConfigurationBuilder>, JvmScriptCompilationConfigurationKeys {
-        override fun get() = JvmScriptCompilationConfigurationBuilder()
-    }
+    companion object : JvmScriptCompilationConfigurationKeys
 }
 
 fun JvmScriptCompilationConfigurationBuilder.dependenciesFromCurrentContext(vararg libraries: String, wholeClasspath: Boolean = false) {
@@ -42,5 +40,5 @@ val JvmScriptCompilationConfigurationKeys.javaHome by PropertiesCollection.keyCo
 
 @Suppress("unused")
 val ScriptCompilationConfigurationKeys.jvm
-    get() = JvmScriptCompilationConfigurationBuilder
+    get() = JvmScriptCompilationConfigurationBuilder()
 

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt

@@ -16,16 +16,14 @@ interface JvmScriptingHostConfigurationKeys
 
 open class JvmScriptingHostConfigurationBuilder : JvmScriptingHostConfigurationKeys, PropertiesCollection.Builder() {
 
-    companion object : PropertiesCollection.Builder.BuilderExtension<JvmScriptingHostConfigurationBuilder>, JvmScriptingHostConfigurationKeys {
-        override fun get() = JvmScriptingHostConfigurationBuilder()
-    }
+    companion object : JvmScriptingHostConfigurationKeys
 }
 
 val JvmScriptingHostConfigurationKeys.javaHome by PropertiesCollection.key<File>(File(System.getProperty("java.home")))
 
 @Suppress("unused")
 val ScriptingHostConfigurationKeys.jvm
-    get() = JvmScriptingHostConfigurationBuilder
+    get() = JvmScriptingHostConfigurationBuilder()
 
 val defaultJvmScriptingEnvironment = ScriptingHostConfiguration {
     getScriptingClass(JvmGetScriptingClass())