util.c: Follow up cleanup on eeefcdf