Commit fixes recommended by pyupgrade tool