More mark and sweep work