Updated after python-ideas first comment round.