Merge fixes to run `./c4x86 c4.c`