Revise PR #343: the rebase is correct, but the closure-class scoping rule false-positives on a class defined inside a METHOD (inherited from #341, missed in my review of it) and the changelog entry ships twice - #350