Ah, ignore me, I see that `choices` is a special case and it may be an iterable. I amended the commit: https://github.com/chrismedrela/django/commit/bc483db0cb472bae2d3742963828b8aea4b0d89e