More C89 compat