Cleanups for E-Put/E-Put case of Generalized Clash.