Vitalik's diff changes.