Get rid of more non-ANSI declarations.