Some simplifications to type classes.