Merge "Simplify handling of nested classes" into main