Update utils to use six rather than 2to3