First round of ICH2/ICH2-M cleanups after split from i82801xx.