Merge "Refactor large object sweeping."