Small changes from PyWeek 16.