Simplify patches. Update to latest gdc-4.8