Remove old macros that cause compile error in libC++ on OSX.