Upgrading to type class generators.