Make Choices more compatible when indexed

This commit to Django is related: https://github.com/django/django/commit/2f73b527dda6683868fac2791f7f07ccb01ea0d9#diff-bf776a3b8e5dbfac2432015825ef8afeR733