Another bunch of C99 array conversions (few more to go)