Fix needsExtraCleanup by adding classInfo prefix.