node-form.tpl.php should have themer-friendly output

I thought this module was exactly what I needed, until I took a look at the default markup in node-form.tpl.php... yikes. :)

<div class="node-form">
  <div class="standard">
    <?php print implode('', $form['#rendered_content_children']); ?>
  </div>
  <?php print implode('', $form['#rendered_generic_children']); ?>
</div>

That output scares the bejeezus out of me, let alone a poor themer who only has XHTML/CSS knowledge and maybe enough PHP to be dangerous. :)

I would've expected this to look a lot more like http://api.drupal.org/api/function/theme_node_form/6, with divs clearly delineating where parts of the form lay and individual fields rendered out and stuff like that.