Fixed comment formatting in some places.
Cannot sweep during arena adoption, so put previous assertion back.

As a drive-by fix, also removed clearing code that I (Felix) added
experimentally but have no confidence in.