Fix up handling of Intel G4X chips some more.