Fix choice build after update

@kenearley @stof Another easy bug fix.

This resolves #1270. Essentially, the condition here wasn't testing the proper value. We can safely clear all choices as we're already re-building choices at a later point.

(btw, my commit message on 3e0fbf7 is wrong, but the sentiment is rightish)