Improve selectivity calculations.

With this change we no longer discard label predicates after using them.