diff --git a/guice.iws b/guice.iws
index 5ac7b74..b3befed 100644
--- a/guice.iws
+++ b/guice.iws
@@ -18,10 +18,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ContainerCreationException.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ContainerCreationException.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iml" afterPath="$PROJECT_DIR$/guice.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/intercept/ProxyFactory.java" afterPath="$PROJECT_DIR$/src/com/google/inject/intercept/ProxyFactory.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iws" afterPath="$PROJECT_DIR$/guice.iws" />
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/build/cglib-nodep-2.1_3.jar" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/intercept/Queries.java" afterPath="$PROJECT_DIR$/src/com/google/inject/intercept/Queries.java" />
       <change type="DELETED" beforePath="$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar" afterPath="" />
     </list>
   </component>
@@ -213,15 +215,6 @@
         </entry>
       </file>
       <file leaf-file-name="package-info.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/google/inject/package-info.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="674" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="package-info.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/google/inject/intercept/package-info.java">
           <provider selected="true" editor-type-id="text-editor">
             <state line="23" column="28" selection-start="863" selection-end="863" vertical-scroll-proportion="0.6337115">
@@ -242,7 +235,16 @@
       <file leaf-file-name="ContainerBuilder.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="57" column="3" selection-start="1894" selection-end="1894" vertical-scroll-proportion="-5.593193">
+            <state line="58" column="19" selection-start="1914" selection-end="1914" vertical-scroll-proportion="0.33225283">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ContainerCreationException.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerCreationException.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="37" column="18" selection-start="1151" selection-end="1151" vertical-scroll-proportion="0.52512157">
               <folding />
             </state>
           </provider>
@@ -371,10 +373,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ProxyFactory.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="ProxyFactory.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/google/inject/intercept/ProxyFactory.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="65" column="58" selection-start="2171" selection-end="2171" vertical-scroll-proportion="0.4132901">
+            <state line="49" column="41" selection-start="1646" selection-end="1646" vertical-scroll-proportion="0.36628848">
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -382,10 +384,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Queries.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="Queries.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/google/inject/intercept/Queries.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="101" column="28" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.8265802">
+            <state line="34" column="18" selection-start="1040" selection-end="1040" vertical-scroll-proportion="0.027552674">
               <folding />
             </state>
           </provider>
@@ -414,7 +416,7 @@
       <file leaf-file-name="guice.iws" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/guice.iws">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="973" column="38" selection-start="47825" selection-end="47825" vertical-scroll-proportion="0.3936877">
+            <state line="961" column="26" selection-start="47825" selection-end="47825" vertical-scroll-proportion="0.3936877">
               <folding />
             </state>
           </provider>
@@ -1096,20 +1098,6 @@
     <option name="myLastEditedConfigurable" value="Default" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/com/google/inject/AbstractErrorHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="0" selection-start="1032" selection-end="1032" vertical-scroll-proportion="0.38573745">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/google/inject/ErrorHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="841" selection-end="841" vertical-scroll-proportion="0.5235008">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/google/inject/ErrorMessages.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="42" column="25" selection-start="1437" selection-end="1437" vertical-scroll-proportion="0.7714749">
@@ -1119,20 +1107,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/com/google/inject/ErrorHandlingTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="65" column="15" selection-start="1732" selection-end="1732" vertical-scroll-proportion="1.4051864">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="3" selection-start="1894" selection-end="1894" vertical-scroll-proportion="-5.593193">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/google/inject/Container.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="100" column="23" selection-start="2670" selection-end="2670" vertical-scroll-proportion="1.4764992">
@@ -1151,7 +1125,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/guice.iws">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="973" column="38" selection-start="47825" selection-end="47825" vertical-scroll-proportion="0.3936877">
+        <state line="961" column="26" selection-start="47825" selection-end="47825" vertical-scroll-proportion="0.3936877">
           <folding />
         </state>
       </provider>
@@ -1206,13 +1180,41 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/google/inject/intercept/ProxyFactory.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="65" column="58" selection-start="2171" selection-end="2171" vertical-scroll-proportion="0.4132901">
+        <state line="49" column="41" selection-start="1646" selection-end="1646" vertical-scroll-proportion="0.36628848">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/com/google/inject/ErrorHandlingTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="65" column="15" selection-start="1732" selection-end="1732" vertical-scroll-proportion="1.4051864">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="58" column="19" selection-start="1914" selection-end="1914" vertical-scroll-proportion="0.33225283">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerCreationException.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="37" column="18" selection-start="1151" selection-end="1151" vertical-scroll-proportion="0.52512157">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/google/inject/intercept/Queries.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="34" column="18" selection-start="1040" selection-end="1040" vertical-scroll-proportion="0.027552674">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 
diff --git a/src/com/google/inject/ContainerCreationException.java b/src/com/google/inject/ContainerCreationException.java
index ce71c04..23dac00 100644
--- a/src/com/google/inject/ContainerCreationException.java
+++ b/src/com/google/inject/ContainerCreationException.java
@@ -22,7 +22,7 @@
 import java.util.Collections;
 
 /**
- * Thrown when errors occurs while creating a {@link Container}. Includes a
+ * Thrown when errors occur while creating a {@link Container}. Includes a
  * list of encountered errors. Typically, a client should catch this exception,
  * log it, and stop execution.
  *
diff --git a/src/com/google/inject/intercept/Queries.java b/src/com/google/inject/intercept/Queries.java
index 79a503f..bd7f761 100644
--- a/src/com/google/inject/intercept/Queries.java
+++ b/src/com/google/inject/intercept/Queries.java
@@ -30,7 +30,7 @@
 
   private Queries() {}
 
-  static Query<?> ALL = new AbstractQuery<Object>() {
+  static Query<Object> ALL = new AbstractQuery<Object>() {
     public boolean matches(Object o) {
       return true;
     }
@@ -39,9 +39,8 @@
   /**
    * Returns a query which matches any input.
    */
-  @SuppressWarnings({"unchecked"})
-  public static <T> Query<T> all() {
-    return (Query<T>) ALL;
+  public static Query<Object> all() {
+    return ALL;
   }
 
   /**