Fix pre-subsumption and pre-matching