ZX2C4 specific patches.
Experimentally use bleeding edge git.