Don't lose the choices when you add a hint

Test Plan:
On test.html, added choices and then clicked the hint button and didn't
lose any of them. (The simplification checkbox stays too.)

Auditors: eater