Placement of CAPTCHA just above buttons fails on create node forms

Screenshot of "bug": the CAPTCHA administration links are not placed directly above the buttons. "Authoring info" and "publishing options" are squeezed between them. This is for the site administrator. Untrusted users probably have not enough rights to see the authoring and publishing options, so it's not a big problem.

Reason for the bug: the create node form uses a custom theming function which groups the "authoring info", "publishing options" and the buttons. See /modules/node/node.module, function theme_node_form() (around line 2146):

function theme_node_form($form) {
  $output = "\n<div class=\"node-form\">\n";

  // Admin form fields and submit buttons must be rendered first, because
  // they need to go to the bottom of the form, and so should not be part of
  // the catch-all call to drupal_render().
  $admin = '';
  if (isset($form['author'])) {
    $admin .= "    <div class=\"authored\">\n";
    $admin .= drupal_render($form['author']);
    $admin .= "    </div>\n";
  }
  if (isset($form['options'])) {
    $admin .= "    <div class=\"options\">\n";
    $admin .= drupal_render($form['options']);
    $admin .= "    </div>\n";
  }
  $buttons = drupal_render($form['preview']);
  $buttons .= drupal_render($form['submit']);
  $buttons .= isset($form['delete']) ? drupal_render($form['delete']) : '';

  // Everything else gets rendered here, and is displayed before the admin form
  // field and the submit buttons.
  $output .= "  <div class=\"standard\">\n";
  $output .= drupal_render($form);
  $output .= "  </div>\n";

  if (!empty($admin)) {
    $output .= "  <div class=\"admin\">\n";
    $output .= $admin;
    $output .= "  </div>\n";
  }
  $output .= $buttons;
  $output .= "</div>\n";

  return $output;
}

I would label this issue as won't fix however. It would be very messy to fix this and it's not worth the trouble IMHO.