Mac OS X/Darwin: Fix two more mangler bugs. Maybe the profiling libraries will work this time... MERGE TO STABLE