Along the way, simplify a lot of the ForEach callback methods.

Change-Id: I54bc87c1060f1d73470ca8b7fd645ffa23059606