diff --git a/kotlin/builder/BUILD b/kotlin/builder/BUILD
index b14900b..7a104a5 100644
--- a/kotlin/builder/BUILD
+++ b/kotlin/builder/BUILD
@@ -15,14 +15,14 @@
 load("//kotlin:kotlin.bzl", "kt_jvm_library")
 
 # Should not be linked against to allow the compiler workspace to be switched out when toolchains support this.
-_COMPILER_DEPS = [
+COMPILER_DEPS = [
     "@com_github_jetbrains_kotlin//:compiler",
     "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
     "@com_github_jetbrains_kotlin//:kotlin-script-runtime",
 ]
 
 # Common depset for the builder.
-_COMMON_DEPS = [
+COMMON_DEPS = [
     "//kotlin/builder/proto:deps",
     "//kotlin/builder/proto:kotlin_model",
     "//kotlin/builder/proto:worker",
@@ -47,7 +47,7 @@
     args = [
         "-jvm-target","1.8",
     ],
-    neverlink_deps = _COMPILER_DEPS,
+    neverlink_deps = COMPILER_DEPS,
 )
 
 # The builder library.
@@ -57,7 +57,7 @@
     args = [
         "-jvm-target","1.8",
     ],
-    deps = _COMMON_DEPS
+    deps = COMMON_DEPS
 )
 
 # This is a hack so that the builder and compiler sources can be picked up by intellij.
@@ -65,7 +65,7 @@
     name = "for_ide",
     srcs = glob(["src/**/*.kt"]),
     visibility = ["//visibility:private"],
-    deps = _COMMON_DEPS + _COMPILER_DEPS,
+    deps = COMMON_DEPS + COMPILER_DEPS,
 )
 
 # The builder artifact.
@@ -97,7 +97,7 @@
 java_library(
     name = "builder_for_tests",
     testonly = 1,
-    exports = _COMMON_DEPS + [
+    exports = COMMON_DEPS + [
         ":builder_lib",
         ":compiler_lib",
     ],
diff --git a/kotlin/builder/src/io/bazel/kotlin/builder/utils/ArgMap.kt b/kotlin/builder/src/io/bazel/kotlin/builder/utils/ArgMap.kt
index 43839bd..0256e2d 100644
--- a/kotlin/builder/src/io/bazel/kotlin/builder/utils/ArgMap.kt
+++ b/kotlin/builder/src/io/bazel/kotlin/builder/utils/ArgMap.kt
@@ -40,7 +40,6 @@
     fun optional(key: String): List<String>? = map[key]
 }
 
-
 object ArgMaps {
     @JvmStatic
     fun from(args: List<String>): ArgMap =
@@ -55,7 +54,7 @@
         var currentKey: String = args.first().also { require(isFlag(it)) { "first arg must be a flag" } }
         val currentValue = mutableListOf<String>()
         val mergeCurrent = {
-            argMap.computeIfAbsent(currentKey, { mutableListOf() }).addAll(currentValue)
+            argMap.computeIfAbsent(currentKey) { mutableListOf() }.addAll(currentValue)
             currentValue.clear()
         }
         args.drop(1).forEach {
diff --git a/kotlin/internal/bootstrap.bzl b/kotlin/internal/bootstrap.bzl
index 0f51245..4136a90 100644
--- a/kotlin/internal/bootstrap.bzl
+++ b/kotlin/internal/bootstrap.bzl
@@ -22,11 +22,9 @@
         "jars": attr.label_list(
             allow_files = True,
             mandatory = True,
-            cfg = "host",
         ),
         "srcjar": attr.label(
             allow_single_file = True,
-            cfg = "host",
         ),
     },
     implementation = _kt_jvm_import_impl,