Sorry for the noise.  This patch replaces the previous patch for
map_over_members.

OK?