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

You should be able not to duplicate the values here.

Maybe first create the two new dicts, and then create the `STATUS_CHOICES` out of them.