x86: mach-default setup.c cleanups