Missing MVMROOTs.
Don't duplicately process the main thread.
Remove duplicate gen2 root cleanup in wrong place.

Somehow, we had two functions to do this, called in different places.
Eliminate the one and the call to it, and then moved the other call to
a safe place (so we are certain we do the cleanup before we go taking
away the live bits).