* Reduce the number of variables used by the location map block.

Since I keep making the mistake of using comma delimited behaviors in macros, we might as well support the syntax.

Did some theme function renaming for gmap_location to be more in line with the 6.x way of doing it.

This change is from #234344.