Clean up OSX support and rustc path selection somewhat