bpo-36018: Address more reviewer feedback (GH-15733)

3 files changed