Fixed #23112 -- list(self.choices) should go into a local variable, so we don't have to call list again