Index: wp-content/themes/twentyten/comments.php
===================================================================
--- wp-content/themes/twentyten/comments.php	(revision 22598)
+++ wp-content/themes/twentyten/comments.php	(working copy)
@@ -62,16 +62,14 @@
 			</div><!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
-<?php else : // or, if we don't have comments:
+<?php
+/* If there are no comments and comments are closed, let's leave a little note, shall we?
+ * But we only want the note on posts and pages that had comments in the first place.
+ */
+if ( ! comments_open() && get_comments_number() ) : ?>
+	<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyten' ); ?></p>
+<?php endif; // end ! comments_open ?>
 
-	/* If there are no comments and comments are closed,
-	 * let's leave a little note, shall we?
-	 */
-	if ( ! comments_open() ) :
-?>
-	<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
-<?php endif; // end ! comments_open() ?>
-
 <?php endif; // end have_comments() ?>
 
 <?php comment_form(); ?>
Index: wp-content/themes/twentyeleven/comments.php
===================================================================
--- wp-content/themes/twentyeleven/comments.php	(revision 22598)
+++ wp-content/themes/twentyeleven/comments.php	(working copy)
@@ -67,7 +67,7 @@
 		/* If there are no comments and comments are closed, let's leave a little note, shall we?
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
-		if ( ! comments_open() && ! empty( $comments_by_type['comment'] ) ) : ?>
+		if ( ! comments_open() && get_comments_number() ) : ?>
 		<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyeleven' ); ?></p>
 		<?php endif; ?>
 
Index: wp-content/themes/twentytwelve/single.php
===================================================================
--- wp-content/themes/twentytwelve/single.php	(revision 22598)
+++ wp-content/themes/twentytwelve/single.php	(working copy)
@@ -22,11 +22,7 @@
 					<span class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentytwelve' ) . '</span>' ); ?></span>
 				</nav><!-- .nav-single -->
 
-				<?php
-					// If comments are open or we have at least one comment, load up the comment template
-					if ( comments_open() || '0' != get_comments_number() )
-						comments_template( '', true );
-				?>
+				<?php comments_template( '', true ); ?>
 
 			<?php endwhile; // end of the loop. ?>
 
Index: wp-content/themes/twentytwelve/comments.php
===================================================================
--- wp-content/themes/twentytwelve/comments.php	(revision 22598)
+++ wp-content/themes/twentytwelve/comments.php	(working copy)
@@ -49,7 +49,7 @@
 		/* If there are no comments and comments are closed, let's leave a note.
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
-		if ( ! comments_open() && ! empty( $comments_by_type['comment'] ) ) : ?>
+		if ( ! comments_open() && get_comments_number() ) : ?>
 		<!-- If comments are closed. -->
 		<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentytwelve' ); ?></p>
 		<?php endif; ?>