more fixes to InnerClass / EnclosingMethod