--- gmap_location.old	2007-12-30 10:21:45.000000000 -0600
+++ gmap_location.module	2008-02-18 13:28:32.000000000 -0600
@@ -683,15 +683,8 @@ function gmap_location_block_view($nid) 
       if (strlen(variable_get('gmap_location_block_macro_'. $node->type, '')) > 0) {
         $macro = variable_get('gmap_location_block_macro_'. $node->type, '');
       }
-      else {
-        $macro = variable_get('gmap_location_block_macro', '[gmap |id=block0 |zoom=10 |width=100% |height=200px |control=Small |type=Map |behavior=+autozoom,+notype] ');
-      }
-      $map = gmap_parse_macro($macro);
+      $map = array_merge(gmap_defaults(), gmap_parse_macro($macro));
       $map['markers'] = $markers;
-      // @@@
-      $map['behavior']['autozoom'] = true;
-      $map['behavior']['notype'] = true;
-      $map['controltype'] = 'None';
       $block['subject'] = t('Location');
       $block['content'] = theme('gmap', array('#settings' => $map));
     }