start unifying resolved types
some more trimming; getting close to classmate pieces only adding 10kB to jar