Made major improvements to the Mac OS import setup code thanks to troubleshooting from @DrRob.