x86: clean up apic_32/64.c