Works on HEAD and 7.6.3, but fails lint on HEAD.

In particular, singling "map" causes the core lint failure. I think
it's related to #8031.