More C size fixes (thanks Mark McCurry)