Try to get Darwin working
Clean up some 'redefine' lines
More yakshaving...