Some simplifications since we are on Py >= 2.6 now.