Fixed simple bug in the code to handle untagged choice elements.