The bounds on the GeoRanges and UnpackedShapes will now only have 1 polygon.

Shapes tend to be simple with no holes or divides, so 1 polygon should be enough.
Multiple shapes can be used if we need multiple bounding entities.

Also renames some old variable names.