python2+3: Fix patches to apply on -p0