My recent update for python3 support used some idioms that are
unapproved. This fixes them. Backpatch to all live branches like the
original.