Revert rename of `Grid.map` to `Grid.map2`