Mac OS X mangler: follow some minor gcc changes