apple: Redefine some additional clashing Mach types