First step towards getting rid of the non-ANSI stuff.