[unrelated] Support nested CGClass.classes
6 files changed