No links if comments active

Fast response! Well, that revived the other links, but the 'Add Comment' link only shows on the front page teaser view (sorry, not familiar with the correct drupalisms yet), not when the node is viewed in full, and never for polls (probably other node types too) with their own blocks. Perhaps the mods to the links array in blue_zinfandel_links() should only be performed for a teaser view (dunno how you'd test for that)?

How about this - remove blue_zinfandel_links() from template.php, and amend node.tpl.php like this...

Replace

    <?php if (!$page) { // We're in teaser view ?>
       | <?php print $comment_link; ?>
    <?php }; ?>

with

    <?php if (!$page && $comment_link) { // We're in teaser view ?>
       <?php print "| $comment_link"; ?>
    <?php }; ?>

and then

    <?php if ($links) { ?><div class="links">&raquo; <?php print $links?></div><?php }; ?>

with

    <?php if ($links && $page) { ?>
      <div class="links">&raquo; <?php print $links?></div>
    <?php }; ?>

Works for me.