More EGamma user code migration