theme_locations produces entries that look bad in a CCK view

When I add a location element to a CCK node, the header for that section looks different from the headers for the other sections. In theme_locations, it is hardcoded as <h3>, while the CCK node uses a <div> with a style of field-label. I have fixed the appearance in my version by changing the HTML output by theme_location to something like:

<div class="field"><div class="field-label">
Location <!-- or Locations -->
</div>
<!-- location data -->
</div>

That works fine in the CCK view, but it might not look right in other contexts.

Is there a better way to handle this?

Thanks!