More fixes to pre-matching and pre-subsumption