diff --git a/user/super/com/google/gwt/emul/java/lang/Boolean.java b/user/super/com/google/gwt/emul/java/lang/Boolean.java
index d031414..68bcbc2 100644
--- a/user/super/com/google/gwt/emul/java/lang/Boolean.java
+++ b/user/super/com/google/gwt/emul/java/lang/Boolean.java
@@ -27,15 +27,9 @@
  * Wraps native <code>boolean</code> as an object.
  */
 public final class Boolean implements Comparable<Boolean>, Serializable {
-  /*
-   * TODO: figure out how to not clinit this class on direct field access.
-   */
 
-  // CHECKSTYLE_OFF: These have to be created somewhere.
-  public static final Boolean FALSE = new Boolean(false);
-  public static final Boolean TRUE = new Boolean(true);
-
-  // CHECKSTYLE_ON
+  public static final Boolean FALSE = false;
+  public static final Boolean TRUE = true;
 
   public static final Class<Boolean> TYPE = boolean.class;
 
@@ -69,7 +63,7 @@
   }
 
   public static Boolean valueOf(boolean b) {
-    return b ? TRUE : FALSE;
+    return b ? $createBoolean(true) : $createBoolean(false);
   }
 
   public static Boolean valueOf(String s) {
diff --git a/user/super/com/google/gwt/emul/java/lang/Throwable.java b/user/super/com/google/gwt/emul/java/lang/Throwable.java
index 3d27af4..94623cb 100644
--- a/user/super/com/google/gwt/emul/java/lang/Throwable.java
+++ b/user/super/com/google/gwt/emul/java/lang/Throwable.java
@@ -33,7 +33,7 @@
  */
 public class Throwable implements Serializable {
 
-  private static final Object UNITIALIZED = new Object();
+  private static final Object UNINITIALIZED = "__noinit__";
 
   /*
    * NOTE: We cannot use custom field serializers because we need the client and
@@ -55,7 +55,7 @@
   private transient boolean writetableStackTrace = true;
 
   @JsProperty
-  private transient Object backingJsObject = UNITIALIZED;
+  private transient Object backingJsObject = UNINITIALIZED;
 
   public Throwable() {
     fillInStackTrace();
@@ -176,7 +176,7 @@
       // If this is the first run, let constructor initialize it.
       // (We need to initialize the backingJsObject from constructor as our own implementation of
       // fillInStackTrace is not guaranteed to be executed.)
-      if (backingJsObject != UNITIALIZED) {
+      if (backingJsObject != UNINITIALIZED) {
         initializeBackingError();
       }