Update to reflect comings and goings of ns32k and mach-related files