map: MAP_IN_WATER() and map_is_deep_water() serves the same purpose; remove the latter.