Minor changes after attempted to speed up map_field_points_points_double.