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