Get rid of some gcc extension-only code