Further simplifications to the TOS