Remove empty scoop from global set selectively

Thanks to a change to the time when scoops are
added to the file's data scoops, the clause that
removes empty data scoops should not *always*
remove empty scoops from the set of global scoops.