Oops, some dev-mode changes for ISO C90