Fixes bug where falsy choice values incorrectly take the choice name.