[R40] Refine coron-4.2 autopatch.