Remove some glibcisms from previous