[R40] Refine coron-4.0 autopatch.