Get rid of gcc-ism