More nested classes, blocked on SI-7626

https://issues.scala-lang.org/browse/SI-7626