Clean up tuple iteration