diff --git a/dom/public/nsIScriptContext.h b/dom/public/nsIScriptContext.h
index a8ea3f618b23..fd69777db47a 100644
--- a/dom/public/nsIScriptContext.h
+++ b/dom/public/nsIScriptContext.h
@@ -246,7 +246,7 @@ public:
    * Check to see if context is as yet intialized. Used to prevent
    * reentrancy issues during the initialization process.
    *
-   * @return NS_OK if initialized, NS_COMFALSE if not
+   * @return NS_OK if initialized, NS_ERROR_NOT_INITIALIZED if not
    *
    */
   NS_IMETHOD IsContextInitialized() = 0;
diff --git a/dom/public/nsIScriptNameSpaceManager.h b/dom/public/nsIScriptNameSpaceManager.h
index 781d29b3c069..ea148d85725d 100644
--- a/dom/public/nsIScriptNameSpaceManager.h
+++ b/dom/public/nsIScriptNameSpaceManager.h
@@ -76,7 +76,7 @@ public:
    *        a global symbol.
    * @param aCID out parameter that returns the class ID
    *        that corresponds to the name
-   * @result NS_OK if the lookup succeeded. NS_COMFALSE
+   * @result NS_OK if the lookup succeeded. NS_ERROR_INVALID_ARG
    *         if the lookup failed.
    */
   NS_IMETHOD LookupName(const nsString& aName, 
diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/src/base/nsJSEnvironment.cpp
index f4b58eb699af..30713960684b 100644
--- a/dom/src/base/nsJSEnvironment.cpp
+++ b/dom/src/base/nsJSEnvironment.cpp
@@ -892,7 +892,7 @@ nsJSContext::InitClasses()
 NS_IMETHODIMP
 nsJSContext::IsContextInitialized()
 {
-  return (mIsInitialized) ? NS_OK : NS_COMFALSE;
+  return (mIsInitialized) ? NS_OK : NS_ERROR_NOT_INITIALIZED;
 }
 
 NS_IMETHODIMP
diff --git a/dom/src/base/nsJSUtils.cpp b/dom/src/base/nsJSUtils.cpp
index 10a46bc115b8..93d1ee40f33a 100644
--- a/dom/src/base/nsJSUtils.cpp
+++ b/dom/src/base/nsJSUtils.cpp
@@ -503,7 +503,8 @@ nsJSUtils::nsGlobalResolve(JSContext* aContext,
       return JS_TRUE;
     }
 
-    if (NS_COMFALSE == scriptContext->IsContextInitialized()) {
+    result = scriptContext->IsContextInitialized();
+    if (NS_FAILED(result)) {
       return JS_TRUE;
     }
 
diff --git a/dom/src/events/nsJSDOMEventListener.cpp b/dom/src/events/nsJSDOMEventListener.cpp
index 7faedc75b8d0..57e99b358a34 100644
--- a/dom/src/events/nsJSDOMEventListener.cpp
+++ b/dom/src/events/nsJSDOMEventListener.cpp
@@ -99,7 +99,11 @@ nsresult nsJSDOMEventListener::HandleEvent(nsIDOMEvent* aEvent)
 
 nsresult nsJSDOMEventListener::CheckIfEqual(nsIScriptEventListener *aListener)
 {
-  return NS_COMFALSE;
+  /*
+   * This should be rewritten to use a PRBool out parameter in stead of
+   * using the return value to show if this equals aListener...
+   */
+  return NS_ERROR_FAILURE;
 }
 
 /*