Fix rendering of choice values.