Minor cleanups in EffectHandler