Bug 1061323 - Remove confusing cruft from add-on admin pages.

> I think what I should actually do is just kill STATUS_CHOICES entirely and use the appropriate 
> dict everywhere.

That sounds like the best plan :)