Fix codegen of root choices