more fixes to InnerClass / EnclosingMethod
small cleanup in assertions