Be a bit more aggressive about when to rescan for comments. This is
partially a 5.1 regression and partially an upgrade.