Merge "Replace uses of each()"