Migrate extends2, etc. to extends

The explicit extends2, extends3, etc. classes are no longer required and can be replaced by the variadic extends.