Cleaned out C89 madness.