Begin removing pre-ANSI C support