Don't show label if there is no input

I'm getting this on 6.x-1.05. I added the Address field to a pre-existing CCK content type. I haven't entered any address information yet in a pre-existing node (it has other fields populated). The address field displays anyway when I look at the node. I suspect this is because of the comma in the "Default" format. It shouldn't display the field at all if there's no data yet. Attaching a screenshot.

Looks like this has been around: http://drupal.org/node/331531

Ah, found another issue that's the solution to this one. http://drupal.org/node/475060