diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index d000cdb7d015..43cdca85e5f7 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -1040,7 +1040,7 @@ NewCompartment(JSContext *cx, JSPrincipals *principals);
 inline JSCompartment *
 JSObject::getCompartment() const
 {
-    return ((Cell *)this)->compartment();
+    return compartment();
 }
 
 #endif /* jsgc_h___ */
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index 73702207b4d4..454c46690b69 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -103,7 +103,7 @@ js_NewGCString(JSContext *cx)
 inline JSShortString *
 js_NewGCShortString(JSContext *cx)
 {
-    return (JSShortString *) NewFinalizableGCThing<JSShortString>(cx, js::gc::FINALIZE_SHORT_STRING);
+    return NewFinalizableGCThing<JSShortString>(cx, js::gc::FINALIZE_SHORT_STRING);
 }
 
 inline JSString *
@@ -204,21 +204,6 @@ MarkChildren(JSTracer *trc, JSObject *obj)
     (op ? op : js_TraceObject)(trc, obj);
 }
 
-static inline void
-MarkChildren(JSTracer *trc, JSFunction *fun)
-{
-    JSObject *obj = reinterpret_cast<JSObject *>(fun);
-    if (!obj->map)
-        return;
-    if (JSObject *proto = obj->getProto())
-        MarkObject(trc, *proto, "proto");
-
-    if (JSObject *parent = obj->getParent())
-        MarkObject(trc, *parent, "parent");
-    TraceOp op = obj->getOps()->trace;
-    (op ? op : js_TraceObject)(trc, obj);
-}
-
 static inline void
 MarkChildren(JSTracer *trc, JSString *str)
 {
@@ -240,12 +225,6 @@ MarkChildren(JSTracer *trc, JSXML *xml)
 }
 #endif
 
-#if JS_STACK_GROWTH_DIRECTION > 0
-# define JS_CHECK_STACK_SIZE(limit, lval)  ((jsuword)(lval) < limit)
-#else
-# define JS_CHECK_STACK_SIZE(limit, lval)  ((jsuword)(lval) > limit)
-#endif
-
 static inline bool
 RecursionTooDeep(GCMarker *gcmarker) {
 #ifdef JS_GC_ASSUME_LOW_C_STACK
diff --git a/js/src/jsgcstats.cpp b/js/src/jsgcstats.cpp
index 04588abdad42..000a4aa7a20b 100644
--- a/js/src/jsgcstats.cpp
+++ b/js/src/jsgcstats.cpp
@@ -371,7 +371,7 @@ GCTimer::finish(bool lastGC) {
                 gcFile = fopen("gcTimer.dat", "a");
 
                 fprintf(gcFile, "     AppTime,  Total,   Mark,  Sweep, FinObj,");
-                fprintf(gcFile, " FinStr,  Destroy,  newChunks, destoyChunks\n");
+                fprintf(gcFile, " FinStr,  Destroy,  newChunks, destroyChunks\n");
             }
             JS_ASSERT(gcFile);
             fprintf(gcFile, "%12.1f, %6.1f, %6.1f, %6.1f, %6.1f, %6.1f,  %7.1f, ",