Improve the check for departures from C89, and fix the departures