be a little more principled about when to add and remove control effects