We might convert old code so that the as_callable method can go away. But that's merely cosmetic. The main problem is that we want a picklable value for a Choice. That's probably very easy, we just need to find the trick.