More C99 removal