Performance regression fix for heap subsumption and invalidity
heuristic.