further prep for Wiz port. Cleanups, rm cpuctrl mmuhack; add warm