reduce number of generate super$ methods
remove inner class distributor methods in case that there are no inner classes
Fix unit test under JDK6