Merge "Refactor sweeping logic into malloc space."