Tweak rescan logic.

We don't need to include a scanner in its own rescan_set -- the rescan set is
only used when the scanner is already marked for rescan.