un-ghetto-ify some bits of MMIO and add int flag control