Gonzo code modernisation and prep for 64-bit/ARC readiness.