Fix scripts to be cross-2-3-compatible, since 2to3 won't convert them