x86: clean up apic_32.c, take 2