Revise how we store Closure values in Set