Restore some over-eager 3.1 removals.
Remove another py_set utility code reference.