Refactor choice questions.