Removed double counting of expand when estimating cardinality

This may not look like much but it makes benchmarks green, at least locally...