More cleanup to prepare for ioapic support

Signed-off-by: Ronald G. Minnich <rminnich@google.com>