Minor API cleanups based on initial usage.
Fix ugly bug in S/W handling for GEO location format