Improved support for nested inner-classes, inner-enums and inner-structs