Merge "Optimizing: Clean up after tagging arena allocations."