Fix conservative GC some more.