More switching things to use STATUS_CHOICES