improved resolving of inner classes of currently generated class