1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
index 50ef2546d5..9230d6be72 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
@@ -33,11 +33,11 @@ public final class Runtime {
 
   @SkylarkSignature(name = "True", returnType = Boolean.class,
       doc = "Literal for the boolean true.")
-  static final Boolean TRUE = true;
+  private static final Boolean TRUE = true;
 
   @SkylarkSignature(name = "False", returnType = Boolean.class,
       doc = "Literal for the boolean false.")
-  static final Boolean FALSE = false;
+  private static final Boolean FALSE = false;
 
   /**
    * There should be only one instance of this type to allow "== None" tests.
@@ -70,11 +70,11 @@ public final class Runtime {
   /**
    * Set up a given environment for supported class methods.
    */
-  static Environment setupConstants(Environment env) throws EvalException {
+  static Environment setupConstants(Environment env) {
     // In Python 2.x, True and False are global values and can be redefined by the user.
     // In Python 3.x, they are keywords. We implement them as values, for the sake of
     // simplicity. We define them as Boolean objects.
-    return env.update("False", FALSE).update("True", TRUE).update("None", NONE);
+    return env.setup("False", FALSE).setup("True", TRUE).setup("None", NONE);
   }
 
 
@@ -128,7 +128,7 @@ public final class Runtime {
   public static void registerModuleGlobals(Environment env, Class<?> moduleClass) {
     try {
       if (moduleClass.isAnnotationPresent(SkylarkModule.class)) {
-        env.update(
+        env.setup(
             moduleClass.getAnnotation(SkylarkModule.class).name(), moduleClass.newInstance());
       }
       for (Field field : moduleClass.getDeclaredFields()) {
@@ -142,7 +142,7 @@ public final class Runtime {
           if (!(value instanceof BuiltinFunction.Factory
               || (value instanceof BaseFunction
                   && !annotation.objectType().equals(Object.class)))) {
-            env.update(annotation.name(), value);
+            env.setup(annotation.name(), value);
           }
         }
       }
@@ -168,9 +168,9 @@ public final class Runtime {
   }
 
   static void setupMethodEnvironment(
-      Environment env, Iterable<BaseFunction> functions) throws EvalException {
+      Environment env, Iterable<BaseFunction> functions) {
     for (BaseFunction function : functions) {
-      env.update(function.getName(), function);
+      env.setup(function.getName(), function);
     }
   }
 }