Fix state subsumption (which is much slower but correct)