Merge "Refactor and optimize GC code."