Small cleanup in apic.cc/apic.h I would like to test patch.apic-mrieker so I need more clean apic code