Issue #195: Merge comment-wrapper.tpl.php and node.tpl.php.