Follow-up to bug 990787 - Fix GC hazards introduced by part 1 and part 4, caught by static analysis. Pushing to a CLOSED TREE. r=sfink.