Correct some C90-incompatible behavior