bpo-30977: rework code changes according to post-merge code review (GH-9106)

also mention the change and its consequences in What's New
3 files changed