Removed double counting of expand when estimating cardinality

This may not look like much but it makes benchmarks green, at least locally...
But that cost does reflect reality. The factors may be bogus but both expand and selection incur cost proportional to the output of the expand.