Cleaning up some of subsumption&strengthening code