Iron some Python 3 wrinkles